Merge branch 'szzh' into develop

This commit is contained in:
huang 2015-07-20 09:32:02 +08:00
commit c24ee7b8ea
5 changed files with 15 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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

View File

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