diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb index c63d87f6..7ca69544 100644 --- a/app/views/dmsf/_file.html.erb +++ b/app/views/dmsf/_file.html.erb @@ -133,7 +133,7 @@ <% end %> <% end %> - <%= render(:partial => 'dmsf_files/approval_workflow_button', + <%= render(:partial => 'dmsf_workflows/approval_workflow_button', :locals => {:file => file, :file_approval_allowed => @file_approval_allowed, :workflows_available => @workflows_available, :project => project, :wf => wf, :dmsf_link_id => nil }) %> diff --git a/app/views/dmsf_files/_link.html.erb b/app/views/dmsf_files/_link.html.erb index fa69519a..822c8f76 100644 --- a/app/views/dmsf_files/_link.html.erb +++ b/app/views/dmsf_files/_link.html.erb @@ -92,7 +92,7 @@ <% end %> <% # Approval workflow %> <% wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id %> - <%= render(:partial => 'dmsf_files/approval_workflow_button', + <%= render(:partial => 'dmsf_workflows/approval_workflow_button', :locals => {:file => dmsf_file, :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project), :workflows_available => DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', dmsf_file.project_id]).exists?, diff --git a/app/views/dmsf_upload/_form.html.erb b/app/views/dmsf_upload/_form.html.erb index dc86721c..fb828e82 100644 --- a/app/views/dmsf_upload/_form.html.erb +++ b/app/views/dmsf_upload/_form.html.erb @@ -57,7 +57,7 @@ <%= hidden_field_tag("dmsf_links_wfs[#{dmsf_link.id}]", wf.id) if wf %> <% else %> - <%= render(:partial => 'dmsf_files/approval_workflow_button', + <%= render(:partial => 'dmsf_workflows/approval_workflow_button', :locals => {:file => dmsf_link.target_file, :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_link.target_file.project), :workflows_available => DmsfWorkflow.where( diff --git a/app/views/dmsf_files/_approval_workflow_button.html.erb b/app/views/dmsf_workflows/_approval_workflow_button.html.erb similarity index 100% rename from app/views/dmsf_files/_approval_workflow_button.html.erb rename to app/views/dmsf_workflows/_approval_workflow_button.html.erb diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb index dab81eea..a9a358f4 100644 --- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb +++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb @@ -252,7 +252,7 @@ module RedmineDmsf end # Approval workflow wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id - html << controller.send(:render_to_string, {:partial => 'dmsf_files/approval_workflow_button', + html << controller.send(:render_to_string, {:partial => 'dmsf_workflows/approval_workflow_button', :locals => {:file => dmsf_file, :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project), :workflows_available => DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', dmsf_file.project.id]).exists?,