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

make sm_controller show the error in the js

Browse source
This commit is contained in:
maxwell 2011-02-22 22:21:48 -08:00
parent 5bce2d1615
commit e446dcaeb5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/status_messages_controller.rb
View file

@ -18,7 +18,7 @@ class StatusMessagesController < ApplicationController
public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
params[:status_message][:public] = public_flag params[:status_message][:public] = public_flag
@status_message = current_user.build_post(:status_message, params[:status_message]) @status_message = current_user.build_post(:status_message, params[:status_message].merge!(:message => ''))
aspects = current_user.aspects_from_ids(params[:aspect_ids]) aspects = current_user.aspects_from_ids(params[:aspect_ids])
if @status_message.save if @status_message.save
@ -59,7 +59,7 @@ class StatusMessagesController < ApplicationController
end end
else else
respond_to do |format| respond_to do |format|
format.js { render :text => @status_message.errors.full_messages, :status => 406 } format.js { render :json =>{:errors => @status_message.errors.full_messages}, :status => 406 }
format.html {redirect_to :back} format.html {redirect_to :back}
end end
end end

9
public/javascripts/stream.js
View file

@ -59,8 +59,13 @@ var Stream = {
Publisher.clear(); Publisher.clear();
}); });
$(".new_status_message").bind('ajax:failure', function(data, html, xhr) { $(".new_status_message").bind('ajax:failure', function(data, html , xhr) {
Diaspora.widgets.alert.alert('Failed to post message!'); json = $.parseJSON(html.response);
if(json.errors.length != 0){
Diaspora.widgets.alert.alert(json.errors);
}else{
Diaspora.widgets.alert.alert('Failed to post message!');
}
}); });
$(".new_comment").live('ajax:success', function(data, json, xhr) { $(".new_comment").live('ajax:success', function(data, json, xhr) {