模式4没有内容的显示情况

beidou_tim
huang 10 years ago
parent 04b2aee166
commit 33bf4fafa6

@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
def show
# 组织新类型 show_mode判断标准 1为新类型0为旧
if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
if @organization.show_mode.t == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
# REDO:时间紧,暂时先这样
@org_logo_attchment = Attachment.where("container_id =? and container_type =? and attachtype =?", @organization, "Organization", 0).order("created_on desc").first
@ -165,7 +165,7 @@ class OrganizationsController < ApplicationController
def get_project_activities_org org, project_ids
unless project_ids.blank?
project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids.join(',')}) and container_type = 'project'
and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
and org_act_type in ('Message', 'Issue') order by updated_at desc limit 5;")
else
project_acts = nil
end
@ -176,7 +176,7 @@ class OrganizationsController < ApplicationController
def get_course_activities_org org, course_ids
unless course_ids.blank?
project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids.join(',')}) and container_type = 'course'
and org_act_type in ('HomeworkCommon', 'Poll', 'Message', 'News', 'Course') order by updated_at desc limit 8;")
and org_act_type in ('HomeworkCommon', 'Poll', 'Message', 'News', 'Course') order by updated_at desc limit 5;")
else
project_acts = nil
end

File diff suppressed because it is too large Load Diff

@ -1,11 +1,11 @@
<div class="sn-index-resourcesbox">
<a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/files-default.jpg" width="185" height="125" alt=""/></a>
<h3><a href="javascript:void(0);" target="_blank" class="resources-title sn-hidden">仪器资源</a></h3>
<div class="resources-tagbox">
<a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>
<a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>
<a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>
<a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>
</div>
<a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>
<a href="javascript:void(0);" target="_blank" class="sn-resourcesimg"><img src="/images/default_blank/left-04.jpg" width="185" height="125" alt=""/></a>
<!--<h3><a href="javascript:void(0);" target="_blank" class="resources-title sn-hidden">仪器资源</a></h3>-->
<!--<div class="resources-tagbox">-->
<!--<a href="javascript:void(0);" target="_blank" class="resources-tag">测试服务</a>-->
<!--<a href="javascript:void(0);" target="_blank" class="resources-tag">开放日</a>-->
<!--<a href="javascript:void(0);" target="_blank" class="resources-tag">仪器共享</a>-->
<!--<a href="javascript:void(0);" target="_blank" class="resources-tag">定制测试</a>-->
<!--</div>-->
<!--<a href="javascript:void(0);" target="_blank" class="more-btn">更多</a>-->
</div>
Loading…
Cancel
Save