Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/repositories_controller.rb

@@ -46,6 +46,7 @@ class RepositoriesController < ApplicationController
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
+    if @project.repositories.count == 0
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)
       @repository.is_default = @project.repository.nil?
@@ -56,6 +57,10 @@ class RepositoriesController < ApplicationController
       else
         render :layout => 'base_projects'
       end
+    else
+      render_403
+    end
+
   end
   
   

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

@@ -43,24 +43,26 @@
               <% end %></td>
           </tr>
       <% end %>
+      </tbody>
+    </table>
 <% else %>
-  <p class="nodata"><%= l(:label_no_data) %></p>
+    <p class="nodata"><%= l(:label_repository_no_data) %></p>
 <% end %>
 
-  </tbody>
-</table>
-<a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
-<a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
+<%# 新建版本库 %>
+<% if @project.repositories.count == 0 %>
+    <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
+    <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
       <% course_tag = @project.project_type %>
       <% if User.current.allowed_to?(:manage_repository, @project) %>
           <!--newrepo_project_repository_path(@project, :course => course_tag) -->
           <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
       <% end %>
-</a>
-<div class="cl"></div>
+    </a>
+    <div class="cl"></div>
 
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-<div id="pro_st_edit_ku" class="pro_st_edit_ku">
+    <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+        <div id="pro_st_edit_ku" class="pro_st_edit_ku">
           <ul>
             <li >
               <label class="label02"><%=l(:label_scm)%>：</label>
@@ -96,5 +98,8 @@
           </ul>
           <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
           <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
-</div><!--pro_st_edit_issues end-->
+        </div><!--pro_st_edit_issues end-->
+    <% end %>
+
 <% end %>
+

config/locales/commons/zh.yml

@@ -200,6 +200,7 @@ zh:
   label_subject_empty: 主题不能为空
 
   label_no_data: 没有任何数据可供显示
+  label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息