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

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

This commit is contained in:
cxt 2016-05-09 10:32:48 +08:00
parent fc95d048a5 18b70e9dd3
commit 7b84c994e0
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/words_controller.rb
View File

@ -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|

8
app/views/organizations/_org_subfield_leftM1.html.erb
View File

@ -3,11 +3,11 @@
<% case field.name %>
<% when 'course' %>
<% if @course_acts.blank? %>
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">课程动态</h2>
<div class="cl"></div>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %>
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">课程动态</h2>
<div class="cl"></div>
<% @course_acts.first(1).each do |act| %>
<% if act.org_act_type == "HomeworkCommon" %>
@ -95,11 +95,11 @@
<% end %>
<% when 'project' %>
<% if @project_acts.blank? %>
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">项目动态</h2>
<div class="cl"></div>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %>
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">项目动态</h2>
<div class="cl"></div>
<% @project_acts.first(1).each do |act| %>
<% if act.org_act_type == "Issue" %>

8
app/views/organizations/_org_subfield_leftMD.html.erb
View File

@ -4,7 +4,7 @@
<% when 'course' %>
<% if @course_acts.blank? %>
<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">课程动态</h2>
<div class="sn-index-resourcescon">
<%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
<div class="cl"></div>
@ -12,7 +12,7 @@
</div>
<% else %>
<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">课程动态</h2>
<div class="sn-index-resourcescon">
<% @course_acts.first(4).each do |act| %>
<% if act.org_act_type == "HomeworkCommon" %>
@ -106,7 +106,7 @@
<% when 'project' %>
<% if @project_acts.blank? %>
<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">项目动态</h2>
<div class="sn-index-resourcescon">
<%= render :partial => 'organizations/org_subfield_leftMD_default', :locals => {:field => field} %>
<div class="cl"></div>
@ -114,7 +114,7 @@
</div>
<% else %>
<div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title"><%= field.name %></h2>
<h2 class="h2-title">项目动态</h2>
<div class="sn-index-resourcescon">
<% @project_acts.first(4).each do |act| %>
<% if act.org_act_type == "Issue" %>

8
app/views/organizations/_org_subfield_rightT.html.erb
View File

@ -3,13 +3,13 @@
<% when 'course' %>
<% if @course_acts.blank? %>
<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title mb18"><%= field.name %></h2>
<h2 class="h2-title mb18">课程动态</h2>
<%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
<div class="cl"></div>
</div>
<% else %>
<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title mb18"><%= field.name %></h2>
<h2 class="h2-title mb18">课程动态</h2>
<% @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? %>
<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title mb18"><%= field.name %></h2>
<h2 class="h2-title mb18">项目动态</h2>
<%= render :partial => 'organizations/org_subfield_rightT_default', :locals => {:field => field} %>
<div class="cl"></div>
</div>
<% else %>
<div class="sn-index-activebox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title mb18"><%= field.name %></h2>
<h2 class="h2-title mb18">项目动态</h2>
<% @project_acts.first(4).each do |act| %>
<% if act.org_act_type == "Issue" %>
<% activity = Issue.find(act.org_act_id) %>