diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index c7aa42b9e..e1e99447d 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -548,7 +548,8 @@ class AdminController < ApplicationController
#作业
def homework
- @homework = HomeworkCommon.order('end_time desc')
+ #@homework = HomeworkCommon.order('end_time desc')
+ @homework = HomeworkCommon.order( 'created_at desc ')
@homework = paginateHelper @homework,30
@page = (params['page'] || 1).to_i - 1
respond_to do |format|
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 81e4d7bfb..dd86d6ccd 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -43,7 +43,7 @@ class OrganizationsController < ApplicationController
def edit
# @organization = Organization.find(params[:id])
begin
- @organization = Organization.where("id =?", params[:id])
+ @organization = Organization.where("id =?", params[:id])
ensure
render_404
end
@@ -63,7 +63,7 @@ class OrganizationsController < ApplicationController
@organization.description = params[:organization][:description]
@organization.is_public = params[:organization][:is_public]
@organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
- @organization.show_mode = params[:show_mode]
+ @organization.show_mode = 0
@organization.creator_id = User.current.id
member = OrgMember.new(:user_id => User.current.id)
@@ -76,19 +76,42 @@ class OrganizationsController < ApplicationController
def show
# 组织新类型 show_mode：判断标准 1为新类型，0为旧
- if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:type] .nil?
+ if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
@subfield_content = @organization.org_subfields.order("priority")
+ @organization = Organization.find(params[:id])
+ # 统计访问量
+ @organization.update_column(:visits, @organization.visits.to_i + 1)
+
+ # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+ # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+ # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
+
+ shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
+ shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
+ project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
+ course_ids = (@organization.courses.map(&:id)-shield_course_ids) << 0
+ course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+ @project_acts = get_project_activities_org @organization, project_ids
+ @course_acts = get_course_activities_org @organization, course_ids
+ #@org_acts = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc')
+ #@project_acts = OrgActivity.where("(container_id =? and container_type =?) " +
+ # "or (container_type ='Project' and org_act_type in ('Issue','Message') and container_id in (#{project_ids.join(',')})) ",
+ # @organization.id, 'Organization').order('updated_at desc').limit(8)
+
+ #@course_acts = OrgActivity.where("(container_id =? and container_type =?) " +
+ # "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+ # @organization.id, 'Organization').order('updated_at desc').limit(8)
+
+
+
# 项目两种动态
- @project_acts = get_project_activities_org @organization
- @project_issue_acts = get_project_issue_activities_org @organization
- @project_message_acts = get_project_message_activities_org @organization
- # 磕碜动态
+ #@project_acts = get_project_activities_org @organization
+
+ # 课程动态
#@project_acts_issues = get_project_activities_org @organization
- @course_acts = get_course_activities_org @organization
- @course_acts_homework = get_course_homework_activities_org @organization
- @course_acts_message = get_course_message_activities_org @organization
- @course_acts_news = get_course_news_activities_org @organization
+ #@course_acts = get_course_activities_org @organization
+
render :layout => 'base_org_newstyle'
else
render_403
@@ -97,7 +120,7 @@ class OrganizationsController < ApplicationController
if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
@organization = Organization.find(params[:id])
# 统计访问量
- @organization.update_attribute(:visits, @organization.visits.to_i + 1)
+ @organization.update_column(:visits, @organization.visits.to_i + 1)
if params[:org_subfield_id]
@org_subfield = OrgSubfield.find(params[:org_subfield_id])
@org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
@@ -162,10 +185,10 @@ class OrganizationsController < ApplicationController
end
# 获取整过项目的动态
- def get_project_activities_org org
- project_ids = org.projects.map{|project| project.id}.join(",")
+ 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}) and container_type = 'project' order by updated_at desc limit 8;")
+ 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;")
else
project_acts = nil
end
@@ -173,10 +196,10 @@ class OrganizationsController < ApplicationController
end
# 获取整过课程的动态
- def get_course_activities_org org
- course_ids = org.courses.map{|course| course.id}.join(",")
+ 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}) and container_type = 'course' order by updated_at desc limit 8;")
+ 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;")
else
project_acts = nil
end
@@ -225,9 +248,13 @@ class OrganizationsController < ApplicationController
#@organization.name = params[:organization][:name]
@organization.save
respond_to do |format|
+ if @organization.show_mode == 1
+ format.html { redirect_to organization_path(@organization)}
+ else
format.html { redirect_to setting_organization_path(@organization)}
end
end
+ end
def check_uniq
@check = false;
diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index e21307485..a3a64b316 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -22,7 +22,7 @@
提交作品数
|
- 提交截止日期
+ 作业发布日期
|
@@ -37,9 +37,11 @@
<%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
|
+ <% if homework.course %>
<%= link_to(homework.course.name, course_path(homework.course.id)) %>
|
+ <% end %>
<%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
<% if homework.try(:user).try(:realname) == ' '%>
<%= link_to(homework.try(:user), user_path(homework.user_id)) %>
@@ -51,7 +53,7 @@
<%=link_to(StudentWork.where('homework_common_id=?',homework.id).count, student_work_index_path(:homework => homework.id))%>
|
- <%=format_date(homework.end_time) %>
+ <%=format_date( homework.created_at ) %>
|
<% end %>
diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb
index 02b897f80..6fde09ede 100644
--- a/app/views/admin/organization.html.erb
+++ b/app/views/admin/organization.html.erb
@@ -24,7 +24,8 @@
">
|
- <%= link_to org.name,home_path(:organization => org.id) %>
+ <%#= link_to org.name,home_path(:organization => org.id) %>
+ <%= link_to org.name, organization_path(org) %>
|
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 442bb7b60..2bb3975cf 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -65,7 +65,7 @@
|
+ <%= link_to image_tag("/images/org_new_style/default-img.jpg", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+
<% else %>
- 
+ <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), student_work_index_url_in_org(activity.id), :target => "_blank" %>
+
<% end %>