From 5febe8a58d432382f32066f45dad8b13706a8525 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 1 Nov 2013 09:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E5=8A=A0=E5=85=A5=E4=BA=86=E2=80=9C?= =?UTF-8?q?=E9=80=80=E5=87=BA=E8=AF=BE=E7=A8=8B=E2=80=9D=E5=92=8C=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 2 +- app/controllers/projects_controller.rb | 6 +++--- app/views/users/_course_form.html.erb | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 712c86680..5168913a7 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -100,7 +100,7 @@ class MembersController < ApplicationController #added by nie if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3") @projectInfo = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id) - @projectInfo.save + @projectInfo.save else user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id) if user_admin.size > 0 diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f1b8f6cc2..8023042ff 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -748,7 +748,7 @@ class ProjectsController < ApplicationController # @course_tag = params[:course] # if @course_tag == '1' if @project.project_type == 1 - @course = Course.find_by_extra(@project.identifier) + @course = Course.find_by_extra(@project.identifier) render :layout => 'base_courses' else render :layout => 'base_projects' @@ -762,7 +762,7 @@ class ProjectsController < ApplicationController #by young def member if @project.project_type == 1 - render :layout => 'base_courses' + render :layout => 'base_courses' end # roles = Role.find_all_givable # members = @project.member_principals.includes(:roles, :principal).all.sort @@ -912,7 +912,7 @@ class ProjectsController < ApplicationController def watcherlist if @watched - @users -= watched.watcher_users + @users -= watched.watcher_users end end end diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 579f5dbef..0fe03a825 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -9,8 +9,10 @@
<%= link_to_project(membership.project) %> - - <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   + + + + <%= join_in_course(membership.project, User.current)%>    <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   <%= l(:label_homework) %> (<%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %>)    <%= l(:label_course_news)%> (<%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %>)