jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining

This commit is contained in:
huang 2017-02-24 09:04:07 +08:00
parent 7074cbdba6 4885ec5afb
commit 658023cbe0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/users/all_journals.js.erb
View File

@ -45,6 +45,7 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :
:locals => {:comments => @journals, :locals => {:comments => @journals,
:user_activity_id => @user_activity_id, :user_activity_id => @user_activity_id,
:activity => @activity}) %>'); :activity => @activity}) %>');
sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity");
<% elsif params[:type] == 'is_project_message' %> <% elsif params[:type] == 'is_project_message' %>
$('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'projects/project_message_replies', $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'projects/project_message_replies',
:locals => {:comments => @journals, :locals => {:comments => @journals,