Wrong authorization in case of global approval workflows

This commit is contained in:
Karel Picman 2014-04-04 15:13:38 +02:00
parent c29fa23145
commit 4a20641468
2 changed files with 13 additions and 6 deletions

View File

@ -335,12 +335,19 @@ class DmsfWorkflowsController < ApplicationController
private
def find_project
if @dmsf_workflow && @dmsf_workflow.project
@project = @dmsf_workflow.project
elsif params[:project_id].present?
@project = Project.find_by_id params[:project_id]
if @dmsf_workflow
if @dmsf_workflow.project # Project workflow
@project = @dmsf_workflow.project
else # Global workflow
revision = DmsfFileRevision.find_by_id params[:dmsf_file_revision_id]
@project = revision.project if revision
end
else
@project = Project.find_by_identifier params[:id]
if params[:project_id].present?
@project = Project.find_by_id params[:project_id]
else
@project = Project.find_by_identifier params[:id]
end
end
end

View File

@ -24,7 +24,7 @@
<% end %>
<%= labelled_form_for @dmsf_workflow do |f| %>
<%= error_messages_for 'workflow' %>
<%= error_messages_for 'dmsf_workflow' %>
<div class="box tabular">
<p><%= f.label :label_dmsf_workflow_name %><%= text_field_tag :name %></p>
<% if project %>