修改了一些BUG

app/controllers/members_controller.rb

@@ -55,7 +55,7 @@ class MembersController < ApplicationController
         user_ids.each do |user_id|
           members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
           ## added by nie
-          if params[:membership][:role_ids][0] == "3"
+          if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
             project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id)
           # ProjectInfo.create(:name => "test", :user_id => 123)
           end
@@ -64,8 +64,8 @@ class MembersController < ApplicationController
       else
         members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
         ## added by nie
-        if params[:membership][:role_ids][0] == "3"
-          project_info << Project_info.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
+        if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+          project_info << ProjectInfo.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
         end
       ## end
       end
@@ -94,7 +94,7 @@ class MembersController < ApplicationController
       @member.role_ids = params[:membership][:role_ids]
 
       #added by nie
-      if params[:membership][:role_ids][0] == "3"
+      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
       else

app/controllers/projects_controller.rb

@@ -484,6 +484,7 @@ class ProjectsController < ApplicationController
        
     @course_tag = params[:project][:project_type]
     if(@course_tag=="1")
+      if User.current.user_extensions.identity == 0
       @course = Course.new
       @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
       @course.safe_attributes = params[:project][:course]
@@ -491,6 +492,7 @@ class ProjectsController < ApplicationController
       # added by bai
       @course.term = params[:term]
       @course.time = params[:time]
+      end
       # end
       # @course.save
        # project = ProjectInfo.create(:user_id => User.current.id, :project_id => @project.id)
@@ -504,6 +506,7 @@ class ProjectsController < ApplicationController
       @project.identifier = @course.extra
     end
     if @course_tag == '1' 
+      if User.current.user_extensions.identity == 0
         if@course.save
           if validate_parent_id && @project.save
             @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
@@ -556,6 +559,7 @@ class ProjectsController < ApplicationController
             end
           end
         end
+      end
     else
       if validate_parent_id && @project.save
           @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')

app/views/layouts/base_courses.html.erb

@@ -170,7 +170,7 @@
 									<li><%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news)%></li>
 					                <!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
 								    <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
-								    <li><%= link_to l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project}, :class => link_class(:settings)%></li></ul>
+								    <li><%= link_to l(:label_course_settings), {:controller => 'projects', :action => 'settings', :id => @project}, :class => link_class(:settings)%></li></ul>
 									<% end %>
 							</div>
 							<%= yield %>

app/views/projects/course.html.erb

@@ -7,7 +7,10 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td width="16%"><span style="margin-left:0px"><%= l(:label_new_course)%></span></td>
-			<td valign="center"><%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
+			<td valign="center">
+				<% if User.current.user_extensions.identity == 0 %>
+				<%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
+			    <% end %>
 			<td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'name', params[:name], :size => 30 %>

app/views/users/_my_course.html.erb

@@ -6,11 +6,11 @@
 		</p>
 		<% else %>
 		<p class="font_description">
-			<%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_course_new)}",:controller=>'projects',:action=>'new', :course => 1 %>
+			<%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %>
 		</p>
 		<% end %>
 	<% else %>
-	<%= link_to"#{l(:label_course_new)}",:controller=>'projects',:action=>'new', :course => 1 %>
+	<%= link_to"#{l(:label_course_new)}",{:controller=>'projects',:action=>'new', :course => 1}, :class => 'icon icon-add' %>
 	<ul class="user_project_sort">
 		<% for membership in @memberships %>
 		<li>

config/locales/zh.yml

@@ -709,7 +709,7 @@ zh:
   label_latest_revision_plural: 最近的修订版本
   label_view_revisions: 查看修订
   label_view_all_revisions: 查看所有修订
-  label_max_size: 最大尺寸
+  label_max_size: 最大文件大小
   label_sort_highest: 置顶
   label_sort_higher: 上移
   label_sort_lower: 下移
@@ -959,7 +959,7 @@ zh:
   text_project_destroy_confirmation: 您确信要删除这个项目以及所有相关的数据吗？
   text_subprojects_destroy_warning: "以下子项目也将被同时删除：%{value}"
   text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
-  text_are_you_sure: 您确定？
+  text_are_you_sure: 您确定要删除吗？
   text_journal_changed: "%{label} 从 %{old} 变更为 %{new}"
   text_journal_set_to: "%{label} 被设置为 %{value}"
   text_journal_deleted: "%{label} 已删除 (%{old})"
@@ -1543,3 +1543,4 @@ zh:
   label_third_reward: 三等奖
   label_excellence_reward: 优秀奖
   label_comfort_reward: 入围奖
+  label_course_settings: 课程设置