From 0e5ff38f3a06c0680942e8eb1e89c98756a14735 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Thu, 18 Jul 2013 11:34:19 +0200 Subject: [PATCH] The original DMSF project settings tab added again --- app/controllers/dmsf_workflows_controller.rb | 10 +++++----- app/views/dmsf_workflows/_action.html.erb | 2 +- app/views/dmsf_workflows/_assign.html.erb | 2 +- app/views/dmsf_workflows/_steps.html.erb | 7 ++++--- app/views/dmsf_workflows/new.html.erb | 13 +++++++++---- config/locales/cs.yml | 5 ++++- config/locales/de.yml | 5 ++++- config/locales/en.yml | 9 ++++++--- config/locales/es.yml | 5 ++++- config/locales/fr.yml | 5 ++++- config/locales/ja.yml | 5 ++++- config/locales/ru.yml | 5 ++++- config/locales/zh.yml | 5 ++++- lib/redmine_dmsf/patches/project_tabs_extended.rb | 4 ++-- 14 files changed, 56 insertions(+), 26 deletions(-) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index ad851093..f19319ae 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -146,11 +146,11 @@ class DmsfWorkflowsController < ApplicationController end def create - @workflow = DmsfWorkflow.new(:name => params[:dmsf_workflow][:name], :project_id => params[:project_id]) + @workflow = DmsfWorkflow.new(:name => params[:name], :project_id => params[:project_id]) if request.post? && @workflow.save flash[:notice] = l(:notice_successful_create) if @project - redirect_to settings_project_path(@project, :tab => 'dmsf') + redirect_to settings_project_path(@project, :tab => 'dmsf_workflow') else redirect_to dmsf_workflows_path end @@ -163,10 +163,10 @@ class DmsfWorkflowsController < ApplicationController end def update - if request.put? && @workflow.update_attributes({:name => params[:dmsf_workflow][:name]}) + if request.put? && @workflow.update_attributes({:name => params[:name]}) flash[:notice] = l(:notice_successful_update) if @project - redirect_to settings_project_path(@project, :tab => 'dmsf') + redirect_to settings_project_path(@project, :tab => 'dmsf_workflow') else redirect_to dmsf_workflows_path end @@ -183,7 +183,7 @@ class DmsfWorkflowsController < ApplicationController flash[:error] = l(:error_unable_delete_dmsf_workflow) end if @project - redirect_to settings_project_path(@project, :tab => 'dmsf') + redirect_to settings_project_path(@project, :tab => 'dmsf_workflow') else redirect_to dmsf_workflows_path end diff --git a/app/views/dmsf_workflows/_action.html.erb b/app/views/dmsf_workflows/_action.html.erb index e9f7bded..9057e44e 100644 --- a/app/views/dmsf_workflows/_action.html.erb +++ b/app/views/dmsf_workflows/_action.html.erb @@ -1,4 +1,4 @@ -

<%= l(:label_dmsf_workflow) %>

+

<%= l(:field_label_dmsf_workflow) %>

<%= form_tag({:controller => 'dmsf_workflows', :action => 'new_action'}, :method => :post, diff --git a/app/views/dmsf_workflows/_assign.html.erb b/app/views/dmsf_workflows/_assign.html.erb index ec5c5c2c..70581799 100644 --- a/app/views/dmsf_workflows/_assign.html.erb +++ b/app/views/dmsf_workflows/_assign.html.erb @@ -1,4 +1,4 @@ -

<%= l(:label_dmsf_workflow) %>

+

<%= l(:field_label_dmsf_workflow) %>

<%= form_tag({:controller => 'dmsf_workflows', :action => 'assignment'}, :method => :post, :id => 'assignment-form') do %> diff --git a/app/views/dmsf_workflows/_steps.html.erb b/app/views/dmsf_workflows/_steps.html.erb index e6fda3ad..cc2c4d41 100644 --- a/app/views/dmsf_workflows/_steps.html.erb +++ b/app/views/dmsf_workflows/_steps.html.erb @@ -1,5 +1,5 @@ <% if @workflow.project %> -

<%= link_to l(:label_dmsf_workflow_plural), settings_project_path(@project, :tab => 'dmsf') %> » <%=h @workflow %>

+

<%= link_to l(:label_dmsf_workflow_plural), settings_project_path(@project, :tab => 'dmsf_workflow') %> » <%=h @workflow %>

<% else %>

<%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> » <%=h @workflow %>

<% end %> @@ -7,7 +7,7 @@ <%= labelled_form_for @workflow do |f| %> <%= error_messages_for 'workflow' %>
-

<%= f.text_field :name, :required => true %><%= submit_tag l(:button_save) %>

+

<%= f.label :label_dmsf_workflow_name %><%= text_field_tag :name, @workflow.name %><%= submit_tag l(:button_save) %>

<% end %> @@ -68,7 +68,8 @@ dmsf_workflow_steps_options_for_select(steps), :id => 'selected_step', :style => "width:100px" %>

-

<%= submit_tag l(:dmsf_and) %> <%= submit_tag l(:dmsf_or) %>

+

<%= l(:label_dmsf_workflow_add_approver) %>

+

<%= submit_tag l(:dmsf_and) %> <%= l(:label_or) %> <%= submit_tag l(:dmsf_or) %>

<% end %> diff --git a/app/views/dmsf_workflows/new.html.erb b/app/views/dmsf_workflows/new.html.erb index d2f0103f..ce22199e 100644 --- a/app/views/dmsf_workflows/new.html.erb +++ b/app/views/dmsf_workflows/new.html.erb @@ -1,11 +1,16 @@ -

<%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> » <%=l(:label_dmsf_workflow_new)%>

+<% project = Project.find_by_id params[:project_id] if params[:project_id] %> +<% if project %> +

<%= link_to l(:label_dmsf_workflow_plural), settings_project_path(project, :tab => 'dmsf_workflow') %> » <%=l(:label_dmsf_workflow_new)%>

+<% else %> +

<%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> » <%=l(:label_dmsf_workflow_new)%>

+<% end %> <%= labelled_form_for @workflow do |f| %> <%= error_messages_for 'workflow' %>
-

<%= f.text_field :name, :required => true %>

- <% if params[:project_id] %> -

<%= hidden_field_tag :project_id, params[:project_id] %>

+

<%= f.label :label_dmsf_workflow_name %><%= text_field_tag :name %>

+ <% if project %> +

<%= hidden_field_tag :project_id, project.id %>

<% end %>
<%= submit_tag l(:button_create) %> diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 6cf1960c..eccf68b3 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -212,7 +212,8 @@ cs: error_cannot_start_workflow: Schvalovací proces nemůže být zahájen error_cannot_renumber_steps: Schvalovací kroky nelze přečíslovat label_dmsf_workflow_new: Nový schvalovací proces - label_dmsf_workflow: Schvalovací proces + field_label_dmsf_workflow: Schvalovací proces + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Schvalovací procesy label_dmsf_workflow_step: Krok label_dmsf_workflow_step_plural: Kroky @@ -224,6 +225,8 @@ cs: label_dmsf_wokflow_action_delegate: Delegovat na label_dmsf_wokflow_action_assign: Přiřadit schvalovací proces label_dmsf_wokflow_action_start: Zahájit schvalovací proces + label_dmsf_workflow_add_approver: "Přidat schvalovatele funkcí:" + label_or: nebo label_action: Akce label_note: Komentář title_none: Komentář diff --git a/config/locales/de.yml b/config/locales/de.yml index c2def23c..3310e514 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -212,7 +212,8 @@ de: error_cannot_start_workflow: Workflow can't be started error_cannot_renumber_steps: Steps can't be renumbered label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -224,6 +225,8 @@ de: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/en.yml b/config/locales/en.yml index 108c562d..f40227b5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -211,9 +211,10 @@ en: error_workflow_assign: An error occured while assigning error_cannot_start_workflow: "Workflow can't be started" error_cannot_renumber_steps: "Steps can't be renumbered" - label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow - label_dmsf_workflow_plural: Approval workflows + label_dmsf_workflow_new: New approval workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name + label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps label_dmsf_workflow_approval: Approval @@ -224,6 +225,8 @@ en: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/es.yml b/config/locales/es.yml index 7139fc19..79f4a071 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -214,7 +214,8 @@ es: error_cannot_start_workflow: "Workflow can't be started" error_cannot_renumber_steps: "Steps can't be renumbered" label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -226,6 +227,8 @@ es: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 90b42f9b..eb556416 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -214,7 +214,8 @@ fr: error_cannot_start_workflow: Workflow can't be started error_cannot_renumber_steps: Steps can't be renumbered label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -226,6 +227,8 @@ fr: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/ja.yml b/config/locales/ja.yml index b64dcf83..45f1c5df 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -214,7 +214,8 @@ ja: error_cannot_start_workflow: Workflow can't be started error_cannot_renumber_steps: Steps can't be renumbered label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -226,6 +227,8 @@ ja: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 9e6fbb08..bfdf4424 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -214,7 +214,8 @@ ru: error_cannot_start_workflow: Workflow can't be started error_cannot_renumber_steps: Steps can't be renumbered label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -226,6 +227,8 @@ ru: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 518e9e31..0e9e81db 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -215,7 +215,8 @@ zh: error_cannot_start_workflow: "Workflow can't be started" error_cannot_renumber_steps: "Steps can't be renumbered" label_dmsf_workflow_new: New approval workflow - label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow: Approval Workflow + field_label_dmsf_workflow_name: Approval workflow name label_dmsf_workflow_plural: Approval workflows label_dmsf_workflow_step: Step label_dmsf_workflow_step_plural: Steps @@ -227,6 +228,8 @@ zh: label_dmsf_wokflow_action_delegate: Delegate to label_dmsf_wokflow_action_assign: Assign an approval workflow label_dmsf_wokflow_action_start: Start workflow + label_dmsf_workflow_add_approver: "Add a new aprover(s) with a function:" + label_or: or label_action: Action label_note: Note title_none: None diff --git a/lib/redmine_dmsf/patches/project_tabs_extended.rb b/lib/redmine_dmsf/patches/project_tabs_extended.rb index 7b10c642..ac6f39ad 100644 --- a/lib/redmine_dmsf/patches/project_tabs_extended.rb +++ b/lib/redmine_dmsf/patches/project_tabs_extended.rb @@ -40,8 +40,8 @@ module RedmineDmsf def project_settings_tabs_with_dmsf tabs = project_settings_tabs_without_dmsf if @project.module_enabled? 'dmsf' - #tabs.push({:name => 'dmsf', :controller => :dmsf_state, :action => :user_pref_save, :partial => 'dmsf_state/user_pref', :label => :dmsf}) - tabs << {:name => 'dmsf', :controller => 'dmsf_workflows', :action => 'index', :partial => 'dmsf_workflows/main', :label => 'label_dmsf'} + tabs << {:name => 'dmsf', :controller => 'dmsf_state', :action => 'user_pref_save', :partial => 'dmsf_state/user_pref', :label => :menu_dmsf} + tabs << {:name => 'dmsf_workflow', :controller => 'dmsf_workflows', :action => 'index', :partial => 'dmsf_workflows/main', :label => :label_dmsf_workflow_plural} end return tabs end