- <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
- <%= hidden_field_tag "course",@course.id%>
- <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-
- <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
- <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+
From 76247d74a7636d2175d313cbc52b18993dd28069 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 10:50:48 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=20?=
=?UTF-8?q?=E9=A1=B6=E5=92=8C=E8=B8=A9=E4=B9=8B=E5=90=8E=E6=95=B0=E5=AD=97?=
=?UTF-8?q?=E6=9C=AA=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/praise_tread_helper.rb | 4 ++--
app/views/memos/show.html.erb | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/helpers/praise_tread_helper.rb b/app/helpers/praise_tread_helper.rb
index 90ce6d61d..c142f0973 100644
--- a/app/helpers/praise_tread_helper.rb
+++ b/app/helpers/praise_tread_helper.rb
@@ -20,9 +20,9 @@ module PraiseTreadHelper
# when 0
# return @record.tread_num.nil? ? 0 : @record.tread_num
# end
- return (@record.praise_num.to_i-@record.tread_num.to_i)
+ return ((@record.praise_num.nil? ? 0 : @record.praise_num.to_i)-(@record.tread_num.nil? ? 0 : @record.tread_num.to_i))
else
- return 0
+ return 0
end
end
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 55a2410b0..586279504 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -7,7 +7,9 @@
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
-
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+
+ <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
+
<%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
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 13/17] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E6=95=B0=E5=92=8C=E5=88=9B=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=95=B0?=
=?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20=E5=8E=BB=E9=99=A4=E6=8E=89?=
=?UTF-8?q?=E6=97=A0=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 %>
From ce17cb1da0cdf381ef0f042cf674822421ed1bcb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 15:13:18 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
=?UTF-8?q?=EF=BC=8CTA=E7=9A=84=E8=AF=BE=E7=A8=8B=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=92=8C=E8=AF=BE=E7=A8=8B=E6=95=B0=E9=87=8F=E3=80=81=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E4=B8=8D=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d6597f3da..fa5ce8405 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -448,7 +448,7 @@ class UsersController < ApplicationController
def user_courses4show
query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
- query = query.where("m.user_id = ?",@user.id)
+ query = query.where("m.user_id = ?",@user.id).order("#{Course.table_name}.id desc")
if User.current == @user #看自己
else
if @user.user_extensions!=nil && @user.user_extensions.identity == 0 #看老师
@@ -456,13 +456,12 @@ class UsersController < ApplicationController
query = query.where("r.role_id in(3,7,9)")
end
query = query.where(Course.table_name+".is_public = 1")
- # or exists (select 1 from courses c2,members m2 where c2.id=m2.course_id and c2.id=#{Course.table_name}.id and m2.user_id= User.current.id)
end
if params[:lastid]!=nil && !params[:lastid].empty?
- query = query.where("( (#{Course.table_name}.updated_at=? and #{Course.table_name}.id < ?) or #{Course.table_name}.updated_atnil
end
From b781d22a6292a2788cfe985e518e147e137afe6d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 16:17:13 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E4=B8=AD=E6=B2=A1=E6=9C=89=E7=9A=84?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 15 ++++++++++-----
public/stylesheets/leftside.css | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a0a61786c..b6a961239 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -20,11 +20,10 @@ class CoursesController < ApplicationController
menu_item l(:label_sort_by_influence), :only => :index
before_filter :can_show_course, :except => []
- before_filter :logged_user_by_apptoken,:only => [:show,:new_homework,:feedback]
- before_filter :find_course, :except => [ :index, :search,:list, :new,:join,:unjoin, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_private_courses]
- before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course]
- before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create]
- before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar]
+ before_filter :logged_user_by_apptoken,:only => [:show,:feedback]
+ before_filter :find_course, :except => [ :index, :search, :new,:join,:unjoin, :create, :new_join, :course,:join_private_courses]
+ before_filter :authorize_course, :only => [:show, :settings, :update, :course]
+ before_filter :authorize_course_global, :only => [:new,:create]
before_filter :toggleCourse, :only => [:finishcourse, :restartcourse]
before_filter :require_login, :only => [:join, :unjoin]
@@ -809,6 +808,12 @@ class CoursesController < ApplicationController
end
end
+ #删除课程
+ #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
+ def destroy
+
+ end
+
private
def allow_join course
if course_endTime_timeout? course
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index 50b47fff4..990c02d54 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -15,6 +15,7 @@ a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; h
.pr_close{ display:block; background:url(../images/leftside.png) -1px -49px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
.pr_add{display:block; background:url(../images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
.pr_arrow{display:block; background:url(../images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
+.pr_delete{ display:block; background:url(../images/leftside.png) -1px -157px no-repeat; width:11px; height:11px; margin-top:3px; float:left; }
.pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;}
a:hover.pr_info_name{ color:#3ca5c6;}
.pr_info_score{ font-size:14px; color:#3e4040; }
From 4ce693ad1752bd96bae3e490208350ede14fb042 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Jul 2015 16:49:54 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
=?UTF-8?q?=E5=8C=BA=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/mailer/message_posted.html.erb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index c55f4b000..ed8cb8626 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -8,8 +8,9 @@
<% if @message.project %>
<%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
<% elsif @message.course %>
- <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
- <% end %>
+ <%=h @message.board.course.name %> - <%=h @message.board.name %>:
+ <%= link_to(h(@message.subject), @message_url + "?topic_id=#{@message.id}&&parent_id=#{@message.parent_id ? @message.parent_id : @message.id}",:style=>'color:#1b55a7; font-weight:bold;') %>
+ <% end %>
<%= l(:mail_issue_title_active)%>
From 1b3c6bde69b58f98238cd2756660688ef02f5965 Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Fri, 24 Jul 2015 08:56:19 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5--?=
=?UTF-8?q?=E7=95=99=E8=A8=80=E6=96=87=E6=9C=AC=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/show.html.erb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e8db87a7e..2c91f394f 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -32,7 +32,7 @@