From 654a8078de1717e4f04a5fd44d767bee73d86e1c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 20 Jul 2015 16:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AF=E4=BB=B6=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 24 +++++++- app/views/projects/_tools_expand.html.erb | 4 +- .../{dts_rep.html.erb => dts_dep.html.erb} | 55 +++++++++---------- app/views/projects/dts_yun.html.erb | 3 - app/views/projects/soft_knowledge.html.erb | 46 ++++++++++++++++ app/views/projects/yun_dep.html.erb | 46 ++++++++++++++++ config/routes.rb | 8 ++- 7 files changed, 147 insertions(+), 39 deletions(-) rename app/views/projects/{dts_rep.html.erb => dts_dep.html.erb} (63%) delete mode 100644 app/views/projects/dts_yun.html.erb create mode 100644 app/views/projects/soft_knowledge.html.erb create mode 100644 app/views/projects/yun_dep.html.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 9ddc513cd..2efaf591a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -362,13 +362,33 @@ class ProjectsController < ApplicationController end # dts测试工具 - def dts_rep + def dts_dep render_403 unless User.current.admin? @dts = Dts.all end # dts云部署 - def dts_yun + def yun_dep + render_403 unless User.current.admin? + end + + # 软件知识库 + def soft_knowledge + render_403 unless User.current.admin? + end + + # 在线开发平台 + def online_dev + render_403 unless User.current.admin? + end + + # 软件资源库 + def soft_file + render_403 unless User.current.admin? + end + + # 软件服务 + def soft_service render_403 unless User.current.admin? end diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 897d99fd7..7ba58f424 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -37,12 +37,12 @@
  • <% if User.current.admin? %> - <%= link_to l(:label_project_dts_new) ,dts_rep_project_path(@project), data: { confirm:'你确定要进行DTS测试吗？' } %> + <%= link_to l(:label_project_dts_new) ,dts_dep_project_path(@project), data: { confirm:'你确定要进行DTS测试吗？' } %> <% end %>
  • <% if User.current.admin? %> - <%= link_to l(:label_project_dts_yun) ,dts_yun_project_path(@project) %> + <%= link_to l(:label_project_dts_yun) ,yun_dep_project_path(@project) %> <% end %>
    • diff --git a/app/views/projects/dts_rep.html.erb b/app/views/projects/dts_dep.html.erb similarity index 63% rename from app/views/projects/dts_rep.html.erb rename to app/views/projects/dts_dep.html.erb index 8c2a9e0d8..17630c622 100644 --- a/app/views/projects/dts_rep.html.erb +++ b/app/views/projects/dts_dep.html.erb @@ -9,47 +9,42 @@ #font_color{background:yellow;text-align:center;color:white;}
    -
    -

    测试分析中

    -
    -
    0%
    -
    - -
    + +
    +
    -