From 64cddc8687c2888e6baebf7b99d63117f3a3decf Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Thu, 10 Oct 2013 10:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=87=8C=E9=9D=A2bug=20=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        |  2 +-
 app/views/projects/_new_join.html.erb         |  2 +-
 app/views/projects/member.html.erb            |  6 +--
 app/views/projects/settings/_members.html.erb | 40 +++++++++++++++----
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1ca63cc98..aa6226a62 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -780,7 +780,7 @@ class ProjectsController < ApplicationController
         project_status = ProjectStatus.find_by_project_id(@project.id)
         project_status.destroy
       elsif params[:project][:is_public] == '1'
-        project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0,  :project_type => 1)
+        project_status = ProjectStatus.create(:project_id => @project.id, :watchers_count => 0, :changesets_count => 0, :project_type => 1)
       end
       
       respond_to do |format|
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index 34aa0cda5..b241f60a2 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -47,7 +47,7 @@
 <table border="0">
 	<tr>
 		<td align="cneter">
-  <%= text_field_tag 'course_password', nil, :size => 30%></td>
+  <%= text_field_tag 'course_password', nil, :size => 27 %></td>
 
  <td align="center">
     <%= submit_tag '加入', :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %></td>
diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb
index 0a11d7bd2..bfaad722b 100644
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@@ -18,11 +18,11 @@
     <% if @project.project_type == 1 %>     				
       <div class ="clear avatar_name"> <p>
       	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
-      	Teacher
+      	老师
       	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
-      	Student
+      	学生
       	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='TA' %>
-      	TA 
+      	助教 
       	<% else %>
       	
       	<% end %>     	    	
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index c4670e85c..7d378cb0d 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -20,9 +20,11 @@
       			<label>
       			<% if @project.project_type == 1 %>
       				<% if role == Role.find(3) %>
-      				<%= check_box_tag 'membership[role_ids][]', role.id %>Teacher
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>老师
       				<% elsif role == Role.find(5) %>
-      				<%= check_box_tag 'membership[role_ids][]', role.id %>Student
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>学生
+      				<% elsif role == Role.find(7) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>助教
       				<% elsif role == Role.find(4)%>
       				<% else %>
       				<%= check_box_tag 'membership[role_ids][]', role.id %><%=h role %>
@@ -59,11 +61,11 @@
     <% if @project.project_type == 1 %>     				
        
       	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
-      	Teacher
+      	老师
       	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
-      	Student
+      	学生
       	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='TA' %>
-      	TA
+      	助教
       	<% else %>
       	
       	<% end %>     	    	
@@ -88,9 +90,31 @@
                                           :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
              ) do |f| %>
              
-        <p><% roles.each do |role| %>
-        <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
-                                                       :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+        <p><% roles.each do |role| %>       	       
+        <% if @project.project_type ==1 %>	
+            
+       				<% if role == Role.find(3) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>老师
+      				<% elsif role == Role.find(5) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>学生
+      				<% elsif role == Role.find(7) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>助教
+      				<% elsif role == Role.find(4) %>
+      				<% else %>      				
+      				<% end %>
+      	<% else %>
+      	<label>      		
+        	<% if role == Role.find(3) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>Manager
+      				<% elsif role == Role.find(5) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>Reporter
+      				<% elsif role == Role.find(4) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>Developer
+      				<% elsif role == Role.find(7) %>
+      				<% else %>      				
+      				<% end %>
+       	<% end %>
+        </label>
         <% end %></p>
         <%= hidden_field_tag 'membership[role_ids][]', '' %>
         <p><%= submit_tag l(:button_change), :class => "small" %>