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

app/controllers/projects_controller.rb

@@ -367,6 +367,11 @@ class ProjectsController < ApplicationController
     @dts = Dts.all
   end
 
+  #  dts云部署
+  def dts_yun
+    render_403 unless User.current.admin?
+  end
+
   #发送邮件邀请新用户
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?

app/views/projects/_tools_expand.html.erb

@@ -40,6 +40,11 @@
     <%= link_to l(:label_project_dts_new) ,dts_rep_project_path(@project), data: { confirm:'你确定要进行DTS测试吗？' } %>
   <% end %>
 </li>
+<li>
+  <% if User.current.admin? %>
+      <%= link_to l(:label_project_dts_yun) ,dts_yun_project_path(@project) %>
+  <% end %>
+</li>
 <!--<li>-->
   <!--<%# unless @project.enabled_modules.where("name = 'dts'").empty? %>-->
 	<!--<%#= link_to l(:project_module_dts) ,share_show_path(@project) %>-->

app/views/projects/dts_yun.html.erb

@@ -0,0 +1,3 @@
+<div class="project_r_h">
+  <h2 class="project_h22"><%= l(:label_project_dts_yun) %></h2>
+</div>

config/locales/projects/zh.yml

@@ -92,6 +92,7 @@ zh:
 
   label_project_dts_new: DTS测试
   label_project_dts_statics: DTS缺陷报告
+  label_project_dts_yun: 云化部署
 
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息

config/routes.rb

@@ -386,6 +386,7 @@ RedmineApp::Application.routes.draw do
       get 'feedback', :action => 'feedback', :as => 'project_feedback'
       get 'watcherlist', :action=> 'watcherlist'
       get 'dts_rep', :action=> 'dts_rep'
+      get 'dts_yun', :action=> 'dts_yun'
       get 'invite_members', :action=> 'invite_members'
       get 'invite_members_by_mail', :action=> 'invite_members_by_mail'
       get 'send_mail_to_member', :action => 'send_mail_to_member'