From 6775008b501a1c4da39515c5cfdd6b92046ab712 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 14:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E6=95=B0?=
=?UTF-8?q?=E5=92=8C=E5=88=9B=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=95=B0=E4=B8=8D?=
=?UTF-8?q?=E6=AD=A3=E7=A1=AE=20=E5=8E=BB=E9=99=A4=E6=8E=89=E6=97=A0?=
=?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/users_helper.rb | 83 +++--------------
app/views/layouts/base_users_new.html.erb | 103 +++-------------------
2 files changed, 26 insertions(+), 160 deletions(-)
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index d4f9e4eb8..0b2d74ee8 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -328,73 +328,41 @@ module UsersHelper
return [0,[]]
end
list = query.order("updated_on desc").limit(10).all
- return [count,list];
+ return [count,list]
end
def get_create_course_count(user)
- return Course.where("tea_id = ?",user.id).count()
+ if user == User.current
+ user.courses.count
+ else
+ user.courses.where("is_public = 1").count
+ end
end
def get_join_course_count(user)
- return user.coursememberships.count() - get_create_course_count(user)
+ user.coursememberships.count - get_create_course_count(user)
end
def get_homework_commons_count(user)
- return HomeworkCommon.where("user_id = ?",user.id).count()
+ HomeworkCommon.where("user_id = ?",user.id).count
end
def get_projectandcourse_attachment_count(user)
- return Attachment.where("author_id = ? and container_type in ('Project','Course')",user.id).count()
+ Attachment.where("author_id = ? and container_type in ('Project','Course')",user.id).count
end
def get_create_project_count(user)
- return Project.where("user_id = ? and project_type = ?",user.id,Project::ProjectType_project).count()
+ Project.where("user_id = ? and project_type = ?",user.id,Project::ProjectType_project).count
end
def get_join_project_count(user)
- return user.memberships.count(conditions: "projects.project_type = #{Project::ProjectType_project}") - get_create_project_count(user)
+ user.memberships.count(conditions: "projects.project_type = #{Project::ProjectType_project}") - get_create_project_count(user)
end
def get_create_issue_count(user)
- return Issue.where("author_id = ?",user.id).count()
+ Issue.where("author_id = ?",user.id).count
end
def get_resolve_issue_count(user)
- return Issue.where("assigned_to_id = ? and status_id=3",user.id).count()
+ Issue.where("assigned_to_id = ? and status_id=3",user.id).count
end
def get_anonymous_evaluation_count(user)
- return StudentWorksScore.where("user_id = ? and reviewer_role=3",user.id).count()
+ StudentWorksScore.where("user_id = ? and reviewer_role=3",user.id).count
end
-
- # def query_activities(query,type)
- # query_rec_count = 8
- # # query = query.where("act_type='JournalsForMessage'")
- # #query = query.where("act_type not in (?)", ['JournalsForMessage','Message','HomeworkCommon','News','Issue','Journal','Poll'])
- # list = query.order("id desc").limit(query_rec_count).all
- #
- # result = [];
- # for item in list
- # container = get_activity_container(item,type)
- # if( activity_is_show(item,container) )
- # result << { :item=>item,:e=>container }
- # end
- # end
- # return [lastid,result]
- # end
- # def get_activity_container activity,type
- # e = nil;
- # if type == 'Project'
- # if activity.act_type == 'Poll'
- # # 项目没有问卷
- # # e = Project.find_by_id(activity.act.polls_group_id)
- # else
- # e = activity.act.project if activity.act.respond_to?('project')
- # end
- # end
- # if type == 'Course'
- # if activity.act_type == 'Poll'
- # e = Course.find_by_id(activity.act.polls_group_id)
- # else
- # e = activity.act.course if activity.act.respond_to?('course')
- # end
- # end
- #
- # return e;
- # end
def query_activities(query)
list = query.limit(8).all
result = [];
@@ -406,31 +374,8 @@ module UsersHelper
end
def get_activity_container activity
return activity.activity_container
- # if type == 'Project'
- # return activity.act.project if activity.act.respond_to?('project')
- # end
- # if type == 'Course'
- # if activity.act_type == 'Poll'
- # return Course.find_by_id(activity.act.polls_group_id)
- # end
- # return activity.act.course if activity.act.respond_to?('course')
- # end
- # return nil;
end
- # def activity_is_show(activity,e)
- # if(!e)
- # return false
- # end
- #
- # if activity.user_id == User.current.id
- # return true
- # end
- # if( e.visible? )
- # return true
- # end
- # return false
- # end
def get_activity_act_showname_htmlclear(activity)
str = get_activity_act_showname(activity)
str = str.gsub(/<.*>/,'')
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index ef6d82245..068134bdc 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -19,77 +19,8 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %>
-
<%= yield :header_tags -%>
-
-
@@ -103,12 +34,6 @@ $(".subNav").click(function(){
<%=link_to l(:field_homepage), home_path %> > <%=link_to (@center_flag ? '个人中心' : '个人主页'), user_path(@user) %> > <%=link_to @user.name, user_path(@user) %>
-
-
-
-
-
-
@@ -200,22 +125,18 @@ $(".subNav").click(function(){
<% if @center_flag %>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
<% end %>