修改了项目和课程里面配置成员bug

app/controllers/courses_controller.rb

@@ -8,7 +8,7 @@ class CoursesController < ApplicationController
       course = Project.find(params[:object_id])
       if params[:course_password] == Course.find_by_extra(course.identifier).password
       members = []
-      members << Member.new(:role_ids => [5], :user_id => User.current.id)
+      members << Member.new(:role_ids => [10], :user_id => User.current.id)
       course.members << members
   
       StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])

app/views/projects/settings/_members.html.erb

@@ -1,20 +1,6 @@
 <%= error_messages_for 'member' %>
-<% if @project.project_type == 1 %>
+<% roles = Role.find_all_givable
-<% r = [] %>
-<% for i in 3..5 %>
-<% roles = Role.givable.all[i]
    members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% else %>
-<% r = [] %>
-<% for i in 0..2 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-
-<% end %>
 <div class="splitcontentleft">
 <% if members.any? %>
 <table class="list members">
@@ -30,11 +16,40 @@
   <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
   <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
   <td class="roles">
-    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+    <span id="member-<%= member.id %>-roles"><!-- <%=h member.roles.sort.collect(&:to_s).join(', ') %> -->
+    	<!--modified by huang for: -->
+     <% if @project.project_type == 1 %>     				       
+      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+      	老师      
+      	<% else %>
+      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
+      	<% end %>	      	 
+     <% else %>         	
+      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
+     <% end %>
+    </span>
       <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                           :method => :put,
                                           :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
              ) do |f| %>
+ <!--added by huang for: filer the roles-->
+<%= error_messages_for 'member' %>
+<% if @project.project_type == 1 %>
+<% r = [] %>
+<% for i in 3..5 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% else %>
+<% r = [] %>
+<% for i in 0..2 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% end %>
+<!--end-->                                      
         <p><% r.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 />
@@ -46,6 +61,14 @@
              %></p>
       <% end %>
   </td>
+  <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
+  <%= error_messages_for 'member' %>
+<% roles = Role.find_all_givable
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+  <% if @project.project_type == 1 %>
+  	<%if member.roles.first.to_s == "Manager" %>
+ 		 <td class="buttons"></td> 
+  	<% else %>
   		<td class="buttons">
      	 <%= link_to_function l(:button_edit),
                            "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
@@ -54,6 +77,18 @@
                       :remote => true,
                       :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
   		</td>   
+    <% end %>
+  <% else %> 
+   		<td class="buttons">
+     	 <%= link_to_function l(:button_edit),
+                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                           :class => 'icon icon-edit' %>
+     	 <%= delete_link membership_path(member),
+                      :remote => true,
+                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
+  		</td>  
+  <% end %>
+  <!--end-->
   <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
   </tr>
 <% end; reset_cycle %>
@@ -64,6 +99,25 @@
 <% end %>
 </div>
 
+<!--added by huang for: filer the roles-->
+<%= error_messages_for 'member' %>
+<% if @project.project_type == 1 %>
+<% r = [] %>
+<% for i in 3..5 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% else %>
+<% r = [] %>
+<% for i in 0..2 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% end %>
+<!--end-->
+
 <div class="splitcontentright">
 <% if r.any? %>
   <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
@@ -75,7 +129,7 @@
     <div id="principals_for_new_member">
       <%= render_principals_for_new_members(@project) %>
     </div>
-
+ <!--show the roles which will select-->
     <p style="padding-top: 5px"><%= l(:label_role_plural) %>:    	    	
     <% r.each do |role| %>