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

AWF moved to WF viewes

Browse Source
This commit is contained in:
Karel Picman 2017-09-01 09:01:58 +02:00
parent 747c503331
commit be246a9b67
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/dmsf/_file.html.erb
View File

@ -133,7 +133,7 @@
<span class="icon-only"></span> <span class="icon-only"></span>
<% end %> <% end %>
<% 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, :locals => {:file => file, :file_approval_allowed => @file_approval_allowed,
:workflows_available => @workflows_available, :project => project, :wf => wf, :dmsf_link_id => nil }) %> :workflows_available => @workflows_available, :project => project, :wf => wf, :dmsf_link_id => nil }) %>
</td> </td>

2
app/views/dmsf_files/_link.html.erb
View File

@ -92,7 +92,7 @@
<% end %> <% end %>
<% # Approval workflow %> <% # Approval workflow %>
<% wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id %> <% 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, :locals => {:file => dmsf_file,
:file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project), :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?, :workflows_available => DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', dmsf_file.project_id]).exists?,

2
app/views/dmsf_upload/_form.html.erb
View File

@ -57,7 +57,7 @@
<a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="modify-upload icon-only icon-wf-assigned"></a> <a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="modify-upload icon-only icon-wf-assigned"></a>
<%= hidden_field_tag("dmsf_links_wfs[#{dmsf_link.id}]", wf.id) if wf %> <%= hidden_field_tag("dmsf_links_wfs[#{dmsf_link.id}]", wf.id) if wf %>
<% else %> <% else %>
<%= render(:partial => 'dmsf_files/approval_workflow_button', <%= render(:partial => 'dmsf_workflows/approval_workflow_button',
:locals => {:file => dmsf_link.target_file, :locals => {:file => dmsf_link.target_file,
:file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_link.target_file.project), :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_link.target_file.project),
:workflows_available => DmsfWorkflow.where( :workflows_available => DmsfWorkflow.where(

0
app/views/dmsf_files/_approval_workflow_button.html.erb → app/views/dmsf_workflows/_approval_workflow_button.html.erb
View File

2
lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
View File

@ -252,7 +252,7 @@ module RedmineDmsf
end end
# Approval workflow # Approval workflow
wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id 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, :locals => {:file => dmsf_file,
:file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project), :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?, :workflows_available => DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', dmsf_file.project.id]).exists?,