app/controllers/file_controller.rb in instiki-0.10.1 vs app/controllers/file_controller.rb in instiki-0.10.2

- old
+ new

@@ -34,12 +34,12 @@ def pic check_path 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)) else logger.debug("Image not found: #{file_yard.files_path}/#{@file_name}") @@ -57,10 +57,10 @@ file_yard.upload_file(import_file_name, @params['file']) import_from_archive(file_yard.file_path(import_file_name)) 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 else # to template