deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed error message display in admin/edit_web - Rails flash handling apparently has changed

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-05-09 03:41:00 +00:00
parent f1c5004543
commit b3e355f4bc
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/file_controller.rb
View file

@ -36,8 +36,8 @@ class FileController < ApplicationController
if @params['file']
# form supplied
file_yard.upload_file(@file_name, @params['file'])
flash[:info] = "Image '#{@file_name}' successfully uploaded"
@web.refresh_pages_with_references(@file_name)
flash[:info] = "Image '#{@file_name}' successfully uploaded"
return_to_last_remembered
elsif file_yard.has_file?(@file_name)
send_file(file_yard.file_path(@file_name))
@ -59,7 +59,7 @@ class FileController < ApplicationController
if @problems.empty?
flash[:info] = 'Import successfully finished'
else
flash[:info] = "Import finished, but some pages were not imported:<li>" +
flash[:error] = "Import finished, but some pages were not imported:<li>" +
@problems.join('</li><li>') + '</li>'
end
return_to_last_remembered