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

Merge branch 'cxt_course' into develop 

Conflicts:
	app/controllers/words_controller.rb
This commit is contained in:
cxt 2016-05-06 22:53:16 +08:00
parent 96ce1d8d40 2a55d8f0c3
commit e03bc42c53
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/homework_common_controller.rb
View File

@ -11,7 +11,9 @@ class HomeworkCommonController < ApplicationController
before_filter :member_of_course, :only => [:index] before_filter :member_of_course, :only => [:index]
def index def index
update_homework_time(@course.homework_commons) unless params[:page]
update_homework_time(@course.homework_commons)
end
@new_homework = HomeworkCommon.new @new_homework = HomeworkCommon.new
@new_homework.homework_detail_manual = HomeworkDetailManual.new @new_homework.homework_detail_manual = HomeworkDetailManual.new
@new_homework.course = @course @new_homework.course = @course

5
app/controllers/words_controller.rb
View File

@ -276,8 +276,7 @@ class WordsController < ApplicationController
ids = params[:asset_id].split(',') ids = params[:asset_id].split(',')
update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
end end
@homework_common.update_column(:updated_at, Time.now) @homework_common.update_column('updated_at', Time.now) update_course_activity(@homework_common.class,@homework_common.id)
update_course_activity(@homework_common.class,@homework_common.id)
update_user_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) update_org_activity(@homework_common.class,@homework_common.id)
respond_to do |format| respond_to do |format|
@ -311,7 +310,7 @@ class WordsController < ApplicationController
ids = params[:asset_id].split(',') ids = params[:asset_id].split(',')
update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
end end
@homework_common.update_attributes(:updated_at => Time.now) @homework_common.update_column('updated_at', Time.now)
update_course_activity(@homework_common.class,@homework_common.id) update_course_activity(@homework_common.class,@homework_common.id)
update_user_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) update_org_activity(@homework_common.class,@homework_common.id)

2
app/views/organizations/_org_course_homework.html.erb
View File

@ -183,7 +183,7 @@
<div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>"> <div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>">
<div class="mr5 fontGrey2"> <div class="mr5 fontGrey2">
<% first_pro = project_sort_first(projects).first %> <% first_pro = project_sort_first(projects).first %>
#&nbsp;<%=time_from_now first_pro.first.updated_at %><%= link_to User.find(first_pro.first.user_id).show_name, user_activities_url_in_org(first_pro.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新： #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_url_in_org(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% sort_projects.each_with_index do |pro, i| %> <% sort_projects.each_with_index do |pro, i| %>

2
app/views/users/_course_homework.html.erb
View File

@ -198,7 +198,7 @@
<div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>"> <div class="mt10 relatePWrap" id="relatePWrap_<%=user_activity_id %>">
<div class="mr5 fontGrey2"> <div class="mr5 fontGrey2">
<% first_pro = project_sort_first(projects).first %> <% first_pro = project_sort_first(projects).first %>
#&nbsp;<%=time_from_now first_pro.first.updated_at %><%= link_to User.find(first_pro.first.user_id).show_name, user_activities_path(first_pro.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新： #&nbsp;<%=time_from_now first_pro.updated_at %><%= link_to User.find(first_pro.user_id).show_name, user_activities_path(first_pro.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% sort_projects.each_with_index do |pro, i| %> <% sort_projects.each_with_index do |pro, i| %>