From 415f457dd414af2c11c68db9a09cf4f13ae2d59f Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 18 Jul 2015 19:13:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?dts=E6=8E=A5=E5=8F=A3=EF=BC=88=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 5 +++++ app/views/projects/_tools_expand.html.erb | 5 +++++ app/views/projects/dts_repos.html.erb | 3 +++ config/locales/projects/zh.yml | 2 ++ config/routes.rb | 3 ++- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 app/views/projects/dts_repos.html.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e6e93947c..18240aa20 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -361,6 +361,11 @@ class ProjectsController < ApplicationController end end + # dts工具接口 + def dts_repos + render_403 unless User.current.admin? + end + #发送邮件邀请新用户 def invite_members_by_mail if User.current.member_of?(@project) || User.current.admin? diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index e9e7492cc..50884775f 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -35,6 +35,11 @@
  • <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
    • +
  • + <% if User.current.admin? %> + <%= link_to l(:label_project_dts) ,:controller => "projects", :action => "dts_repos", :id => @project.id %> + <% end %> +
    • diff --git a/app/views/projects/dts_repos.html.erb b/app/views/projects/dts_repos.html.erb new file mode 100644 index 000000000..28f0398c5 --- /dev/null +++ b/app/views/projects/dts_repos.html.erb @@ -0,0 +1,3 @@ +
    +

    <%= l(:label_project_dts) %>

    +
    \ No newline at end of file diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 92e3cdc28..72349dfe8 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -90,6 +90,8 @@ zh: label_project_tool_response: 用户反馈 label_project_news: 项目新闻 + label_project_dts: DTS测试 + label_project_overview: "项目简介" label_expend_information: 展开更多信息 label_project_create: "新建了项目" diff --git a/config/routes.rb b/config/routes.rb index 6ad495a1a..388da80de 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -387,8 +387,9 @@ RedmineApp::Application.routes.draw do get 'watcherlist', :action=> 'watcherlist' get 'invite_members', :action=> 'invite_members' get 'invite_members_by_mail', :action=> 'invite_members_by_mail' + # get 'dts_repos', :aciton => 'dts_repos' get 'send_mail_to_member', :action => 'send_mail_to_member' - match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #add by huang + match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #end post 'modules' post 'archive' From 753caea5ab54e684f125e3d61468ed5400654f46 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Jul 2015 13:10:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DTS=E6=95=B0=E6=8D=AE=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E5=BC=A0=E8=A1=A8=E4=B8=AD=20=E4=BA=91=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=B7=AF=E5=BE=84=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/dts_dep.html.erb | 56 +++++++++++++++-------------- app/views/projects/yun_dep.html.erb | 4 +-- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/app/views/projects/dts_dep.html.erb b/app/views/projects/dts_dep.html.erb index 66e053ebe..099e7d6d6 100644 --- a/app/views/projects/dts_dep.html.erb +++ b/app/views/projects/dts_dep.html.erb @@ -7,6 +7,8 @@ #out{} #in{width:10px; height:20px;background:#15BCCF;color:white;text-align:center;} #font_color{background:yellow;text-align:center;color:white;} + td.redBox {border:1px solid #b0b0b0; width:80px; background-color:#EAEAEA; } + td.redBox2 {border:1px solid #b0b0b0; width:120px; }
    @@ -42,31 +44,33 @@
    - \ No newline at end of file