diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 86a78708b..e17f03c38 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -276,7 +276,8 @@ class WordsController < ApplicationController ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE end - @homework_common.update_column('updated_at', Time.now) update_course_activity(@homework_common.class,@homework_common.id) + @homework_common.update_column('updated_at', Time.now) + update_course_activity(@homework_common.class,@homework_common.id) update_user_activity(@homework_common.class,@homework_common.id) update_org_activity(@homework_common.class,@homework_common.id) respond_to do |format| diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb index ec9523131..4e1eebb94 100644 --- a/app/views/organizations/_org_subfield_leftM1.html.erb +++ b/app/views/organizations/_org_subfield_leftM1.html.erb @@ -3,11 +3,11 @@ <% case field.name %> <% when 'course' %> <% if @course_acts.blank? %> -

<%= field.name %>

+

课程动态

<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> <% else %> -

<%= field.name %>

+

课程动态

<% @course_acts.first(1).each do |act| %> <% if act.org_act_type == "HomeworkCommon" %> @@ -95,11 +95,11 @@ <% end %> <% when 'project' %> <% if @project_acts.blank? %> -

<%= field.name %>

+

项目动态

<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> <% else %> -

<%= field.name %>

+

项目动态

<% @project_acts.first(1).each do |act| %> <% if act.org_act_type == "Issue" %> diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb index e9c20d4bb..faec87015 100644 --- a/app/views/organizations/_org_subfield_leftMD.html.erb +++ b/app/views/organizations/_org_subfield_leftMD.html.erb @@ -4,7 +4,7 @@ <% when 'course' %> <% if @course_acts.blank? %>
-

<%= field.name %>

+

课程动态

<%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
@@ -12,7 +12,7 @@
<% else %>
-

<%= field.name %>

+

课程动态

<% @course_acts.first(4).each do |act| %> <% if act.org_act_type == "HomeworkCommon" %> @@ -106,7 +106,7 @@ <% when 'project' %> <% if @project_acts.blank? %>
-

<%= field.name %>

+

项目动态

<%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
@@ -114,7 +114,7 @@
<% else %>
-

<%= field.name %>

+

项目动态

<% @project_acts.first(4).each do |act| %> <% if act.org_act_type == "Issue" %> diff --git a/app/views/organizations/_org_subfield_rightT.html.erb b/app/views/organizations/_org_subfield_rightT.html.erb index 0dc1ac583..f28c3fdbb 100644 --- a/app/views/organizations/_org_subfield_rightT.html.erb +++ b/app/views/organizations/_org_subfield_rightT.html.erb @@ -3,13 +3,13 @@ <% when 'course' %> <% if @course_acts.blank? %>
-

<%= field.name %>

+

课程动态

<%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
<% else %>
-

<%= field.name %>

+

课程动态

<% @course_acts.first(4).each do |act| %> <% if act.org_act_type == "HomeworkCommon" %> <% activity = HomeworkCommon.find(act.org_act_id) %> @@ -88,13 +88,13 @@ <% when 'project' %> <% if @project_acts.blank? %>
-

<%= field.name %>

+

项目动态

<%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
<% else %>
-

<%= field.name %>

+

项目动态

<% @project_acts.first(4).each do |act| %> <% if act.org_act_type == "Issue" %> <% activity = Issue.find(act.org_act_id) %>