nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No file is now complained about in the view

Browse source
This commit is contained in:
ilya 2010-07-23 16:57:34 -07:00
parent 61a9ba7a6e
commit 8793709284
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/photos_controller.rb
View file

@ -2,7 +2,7 @@ class PhotosController < ApplicationController
before_filter :authenticate_user!
def create
#begin
begin
@photo = Photo.instantiate(params[:photo])
@photo.person = current_user
@ -15,11 +15,13 @@ class PhotosController < ApplicationController
else
render :action => 'album#new'
end
#rescue
# flash[:error] = "Photo upload failed. Are you sure that was an image?"
# redirect_to Album.first(:id => params[:photo][:album_id])
#end
rescue TypeError
flash[:error] = "Photo upload failed. Are you sure an image was added?"
redirect_to Album.first(:id => params[:photo][:album_id])
rescue CarrierWave::IntegrityError ||
flash[:error] = "Photo upload failed. Are you sure that was an image?"
redirect_to Album.first(:id => params[:photo][:album_id])
end
end
def new