redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The original DMSF project settings tab added again

Browse Source
This commit is contained in:
Karel Picman 2013-07-18 11:34:19 +02:00
parent c410c2fa87
commit 0e5ff38f3a
14 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/dmsf_workflows_controller.rb
View File

@ -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

2
app/views/dmsf_workflows/_action.html.erb
View File

@ -1,4 +1,4 @@
<h3 class="title"><%= l(:label_dmsf_workflow) %></h3>
<h3 class="title"><%= l(:field_label_dmsf_workflow) %></h3>
<%= form_tag({:controller => 'dmsf_workflows', :action => 'new_action'},
:method => :post,

2
app/views/dmsf_workflows/_assign.html.erb
View File

@ -1,4 +1,4 @@
<h3 class="title"><%= l(:label_dmsf_workflow) %></h3>
<h3 class="title"><%= l(:field_label_dmsf_workflow) %></h3>
<%= form_tag({:controller => 'dmsf_workflows', :action => 'assignment'},
:method => :post,
:id => 'assignment-form') do %>

7
app/views/dmsf_workflows/_steps.html.erb
View File

@ -1,5 +1,5 @@
<% if @workflow.project %>
<h2><%= link_to l(:label_dmsf_workflow_plural), settings_project_path(@project, :tab => 'dmsf') %> &#187; <%=h @workflow %></h2>
<h2><%= link_to l(:label_dmsf_workflow_plural), settings_project_path(@project, :tab => 'dmsf_workflow') %> &#187; <%=h @workflow %></h2>
<% else %>
<h2><%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> &#187; <%=h @workflow %></h2>
<% end %>
@ -7,7 +7,7 @@
<%= labelled_form_for @workflow do |f| %>
<%= error_messages_for 'workflow' %>
<div class="box tabular">
<p><%= f.text_field :name, :required => true %><%= submit_tag l(:button_save) %></p>
<p><%= f.label :label_dmsf_workflow_name %><%= text_field_tag :name, @workflow.name %><%= submit_tag l(:button_save) %></p>
</div>
<% end %>
@ -68,7 +68,8 @@
dmsf_workflow_steps_options_for_select(steps),
:id => 'selected_step', :style => "width:100px" %>
</p>
<p><%= submit_tag l(:dmsf_and) %>&nbsp<%= submit_tag l(:dmsf_or) %></p>
<p><%= l(:label_dmsf_workflow_add_approver) %></p>
<p><%= submit_tag l(:dmsf_and) %>&nbsp<%= l(:label_or) %>&nbsp<%= submit_tag l(:dmsf_or) %></p>
</fieldset>
<% end %>
</div>

13
app/views/dmsf_workflows/new.html.erb
View File

@ -1,11 +1,16 @@
<h2><%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> &#187; <%=l(:label_dmsf_workflow_new)%></h2>
<% project = Project.find_by_id params[:project_id] if params[:project_id] %>
<% if project %>
<h2><%= link_to l(:label_dmsf_workflow_plural), settings_project_path(project, :tab => 'dmsf_workflow') %> &#187; <%=l(:label_dmsf_workflow_new)%></h2>
<% else %>
<h2><%= link_to l(:label_dmsf_workflow_plural), dmsf_workflows_path %> &#187; <%=l(:label_dmsf_workflow_new)%></h2>
<% end %>
<%= labelled_form_for @workflow do |f| %>
<%= error_messages_for 'workflow' %>
<div class="box tabular">
<p><%= f.text_field :name, :required => true %></p>
<% if params[:project_id] %>
<p><%= hidden_field_tag :project_id, params[:project_id] %></p>
<p><%= f.label :label_dmsf_workflow_name %><%= text_field_tag :name %></p>
<% if project %>
<p><%= hidden_field_tag :project_id, project.id %></p>
<% end %>
</div>
<%= submit_tag l(:button_create) %>

5
config/locales/cs.yml
View File

@ -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ář

5
config/locales/de.yml
View File

@ -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

9
config/locales/en.yml
View File

@ -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

5
config/locales/es.yml
View File

@ -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

5
config/locales/fr.yml
View File

@ -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

5
config/locales/ja.yml
View File

@ -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

5
config/locales/ru.yml
View File

@ -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

5
config/locales/zh.yml
View File

@ -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

4
lib/redmine_dmsf/patches/project_tabs_extended.rb
View File

@ -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