Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
d6c5a88836
1 changed files with 2 additions and 1 deletions
|
|
@ -86,7 +86,8 @@ class AspectsController < ApplicationController
|
|||
if @aspect.update_attributes( params[:aspect] )
|
||||
flash[:notice] = I18n.t 'aspects.update.success',:name => @aspect.name
|
||||
else
|
||||
flash[:notice] = I18n.t 'aspects.update.failure',:name => @aspect.name
|
||||
flash[:error] = I18n.t 'aspects.update.failure',:name => @aspect.name
|
||||
end
|
||||
respond_with @aspect
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue