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

AWF button partial view used instead

Browse Source
This commit is contained in:
Karel Picman 2017-09-01 09:31:44 +02:00
parent be246a9b67
commit 3c3e2aabdd
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/dmsf_workflows/_approval_workflow_button.html.erb
View File

@ -53,9 +53,7 @@
<% else %> <% else %>
<span class="icon"></span> <span class="icon"></span>
<% end %> <% end %>
<% when DmsfWorkflow::STATE_APPROVED %> <% when DmsfWorkflow::STATE_APPROVED, DmsfWorkflow::STATE_REJECTED %>
<span class="icon-only"></span>
<% when DmsfWorkflow::STATE_REJECTED %>
<span class="icon-only"></span> <span class="icon-only"></span>
<% else %> <% else %>
<% if workflows_available %> <% if workflows_available %>

34
app/views/my/blocks/_open_approvals.html.erb
View File

@ -67,9 +67,9 @@
<%= link_to( <%= link_to(
assignment.dmsf_file_revision.workflow_str(false), assignment.dmsf_file_revision.workflow_str(false),
log_dmsf_workflow_path( log_dmsf_workflow_path(
:project_id => assignment.dmsf_file_revision.dmsf_file.project.id, :project_id => assignment.dmsf_file_revision.dmsf_file.project_id,
:id => assignment.dmsf_workflow_step.dmsf_workflow.id, :id => assignment.dmsf_workflow_step.dmsf_workflow_id,
:dmsf_file_revision_id => assignment.dmsf_file_revision.id), :dmsf_file_revision_id => assignment.dmsf_file_revision_id),
:title => assignment.dmsf_file_revision.workflow_tooltip, :title => assignment.dmsf_file_revision.workflow_tooltip,
:remote => true) %> :remote => true) %>
<% else %> <% else %>
@ -86,28 +86,22 @@
<% if assignment.dmsf_file_revision %> <% if assignment.dmsf_file_revision %>
<% if assignment.dmsf_file_revision.dmsf_file.dmsf_folder %> <% if assignment.dmsf_file_revision.dmsf_file.dmsf_folder %>
<%= link_to(h(assignment.dmsf_file_revision.dmsf_file.dmsf_folder.title), <%= link_to(h(assignment.dmsf_file_revision.dmsf_file.dmsf_folder.title),
{:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project, :folder_id => assignment.dmsf_file_revision.dmsf_file.dmsf_folder}) %> {:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project,
:folder_id => assignment.dmsf_file_revision.dmsf_file.dmsf_folder}) %>
<% elsif assignment.dmsf_file_revision.dmsf_file.project %> <% elsif assignment.dmsf_file_revision.dmsf_file.project %>
<%= link_to(l(:link_documents), {:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project }) %> <%= link_to(l(:link_documents), {:controller => 'dmsf', :action => 'show',
:id => assignment.dmsf_file_revision.dmsf_file.project }) %>
<% end %> <% end %>
<% end %> <% end %>
</td> </td>
<td class="dmsf_buttons"> <td class="dmsf_buttons">
<% if assignment.dmsf_workflow_step.dmsf_workflow %> <%= render(:partial => 'dmsf_workflows/approval_workflow_button',
<% assigns = assignment.dmsf_workflow_step.dmsf_workflow.next_assignments(assignment.dmsf_file_revision.id) %> :locals => {:file => assignment.dmsf_file_revision.dmsf_file,
<% index = assigns.find_index{|assign| assign.user_id == User.current.id} if assigns %> :file_approval_allowed => User.current.allowed_to?(:file_approval,
<% if index %> assignment.dmsf_file_revision.dmsf_file.project),
<%= link_to('', :workflows_available => nil,
action_dmsf_workflow_path( :project => assignment.dmsf_file_revision.dmsf_file.project,
:project_id => assignment.dmsf_file_revision.dmsf_file.project.id, :wf => assignment.dmsf_workflow_step.dmsf_workflow, :dmsf_link_id => nil }) %>
:id => assignment.dmsf_workflow_step.dmsf_workflow.id,
:dmsf_workflow_step_assignment_id => assigns[index].id,
:dmsf_file_revision_id => assignment.dmsf_file_revision.id),
:title => l(:title_waiting_for_approval),
:remote => true,
:class => 'icon icon-wf-waiting') %>
<% end %>
<% end %>
</td> </td>
</tr> </tr>
<% end %> <% end %>