github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

RS IZ a nicer fail(notice) on wrong file format on upload

Browse Source
This commit is contained in:
ilya
2010-07-23 11:59:04 -07:00
parent 8f70fb89c0
commit 082274d0d7
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/photos_controller.rb
View File

@@ -2,14 +2,23 @@ class PhotosController < ApplicationController
before_filter :authenticate_user!
def create
@photo = Photo.instantiate(params[:photo])
@photo.person = current_user
begin
@photo = Photo.instantiate(params[:photo])
@photo.person = current_user
if @photo.save
flash[:notice] = "Successfully uploaded photo."
redirect_to @photo.album
else
render :action => 'album#new'
if @photo.save
flash[:notice] = "Successfully uploaded photo."
redirect_to @photo.album
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
end