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

uploading pics when not found in the file yard (same as for files)

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-01-23 13:42:56 +00:00
parent 8263e4bfcd
commit 44eea43940
5 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application.rb
View file

@ -71,7 +71,7 @@ class ApplicationController < ActionController::Base
not @web_name.nil?
end
@@REMEMBER_NOT = ['locked', 'save', 'back', 'file']
@@REMEMBER_NOT = ['locked', 'save', 'back', 'file', 'pic']
def remember_location
if @response.headers['Status'] == '200 OK'
unless @@REMEMBER_NOT.include? action_name or @request.method != :get

12
app/controllers/file_controller.rb
View file

@ -11,7 +11,7 @@ class FileController < ApplicationController
if @params['file']
# form supplied
file_yard.upload(@file_name, @params['file'])
file_yard.upload_file(@file_name, @params['file'])
flash[:info] = "File '#{@file_name}' successfully uploaded"
return_to_last_remembered
elsif file_yard.has_file?(@file_name)
@ -28,10 +28,16 @@ class FileController < ApplicationController
def pic
check_path
if file_yard.has_file?(@file_name)
if @params['file']
# form supplied
file_yard.upload_file(@file_name, @params['file'])
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
render_text "Image not found: #{@file_name}", '404 Not Found'
logger.debug("Image not found: #{file_yard.files_path}/#{@file_name}")
render_action 'file'
end
end