From 23bb0103157c7b29b73cdf17f3957546ff3394f3 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 29 Jul 2016 22:49:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90=E6=95=B0=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_courses_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb index 1abe77b81..83b9ab56b 100644 --- a/app/views/users/_courses_list.html.erb +++ b/app/views/users/_courses_list.html.erb @@ -13,7 +13,7 @@

更新：<%=format_date Time.at(course.updatetime) %>学期：<%=current_time_and_term(course) %>

-

<%=studentCount course %>学生|<%=visable_course_homework course %>作业|<%=visable_attachemnts_incourse(@course).count %>资源

+

<%=studentCount course %>学生|<%=visable_course_homework course %>作业|<%=visable_attachemnts_incourse(course).count %>资源

From 97288d4eb499e3e1a610bf338f2734e58f512f9d Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 29 Jul 2016 22:51:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/applied_project/_applied_join_project.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/applied_project/_applied_join_project.html.erb b/app/views/applied_project/_applied_join_project.html.erb index 457cdf9cc..e2c447992 100644 --- a/app/views/applied_project/_applied_join_project.html.erb +++ b/app/views/applied_project/_applied_join_project.html.erb @@ -19,8 +19,8 @@
  • - -
    确  定
    + + 确  定 取  消
    • From b1fd7048fed572a84cf9e0b7eff3224f7b3e8327 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 29 Jul 2016 22:58:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/applied_project_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb index d779c7759..49ba03eda 100644 --- a/app/controllers/applied_project_controller.rb +++ b/app/controllers/applied_project_controller.rb @@ -61,7 +61,7 @@ class AppliedProjectController < ApplicationController @flag = 3 else @flag = 4 - role = params[:member] == "member_manager" ? 3 : (params[:member] = "member_developer" ? 4 :5) + role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5) applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role) # 申请成功则给项目管理员发送邮件及发送消息 Mailer.run.applied_project(applied_project) From 21eed9ebb39331e806ffbc2d61db8a7944bc5a63 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 29 Jul 2016 23:03:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=90=8C=E6=84=8F?= =?UTF-8?q?=E6=8B=92=E7=BB=9D=E2=80=9C=EF=BC=9A=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_applide_action.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb index fc56b9f22..48e479b22 100644 --- a/app/views/users/_user_message_applide_action.html.erb +++ b/app/views/users/_user_message_applide_action.html.erb @@ -1,5 +1,5 @@ <% if allow_to_show(ma) %> - ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> | + <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> | <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %> <% elsif ma.status == 4 %> 被拒绝 From 07ff420a6a69e073ce66f778de270ec1c52f5374 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 29 Jul 2016 23:23:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B8=85=E6=A5=9A=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f135c8ab2..5dcf493ee 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -792,6 +792,11 @@ class ProjectsController < ApplicationController members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first if members != nil && members.roles.first.to_s != "Manager" members.destroy + # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除 + applied_projects = AppliedProject.where(:project_id => @project.id, :user_id => members.user_id).first + unless applied_projects.nil? + applied_projects.delete + end end respond_to do |format| format.js