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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
maxwell 2010-11-21 23:01:43 -08:00
commit 60dd2f8e60
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/photos_controller.rb
View file

@ -77,9 +77,16 @@ class PhotosController < ApplicationController
if photo if photo
photo.destroy photo.destroy
flash[:notice] = I18n.t 'photos.destroy.notice' flash[:notice] = I18n.t 'photos.destroy.notice'
if photo.status_message_id
respond_with :location => photo.status_message
else
respond_with :location => photos_path
end
else
respond_with :location => photos_path
end end
respond_with :location => photo.status_message
end end
def show def show
@ -108,7 +115,6 @@ class PhotosController < ApplicationController
if current_user.update_post( photo, params[:photo] ) if current_user.update_post( photo, params[:photo] )
flash.now[:notice] = I18n.t 'photos.update.notice' flash.now[:notice] = I18n.t 'photos.update.notice'
respond_to do |format| respond_to do |format|
format.html
format.js{ render :json => photo, :status => 200 } format.js{ render :json => photo, :status => 200 }
end end
else else

2
app/views/photos/_new_photo.haml
View file

@ -15,7 +15,7 @@
onProgress: function(id, fileName, loaded, total){ onProgress: function(id, fileName, loaded, total){
alert(;
}, },
onSubmit: function(id, fileName){ onSubmit: function(id, fileName){