From b5977343fa4933739ee4916b8826f6371ab5916a Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Fri, 17 Feb 2017 10:33:09 +0100
Subject: [PATCH] Wrong redirection if WF name already exists

---
 app/views/dmsf_workflows/new.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/dmsf_workflows/new.html.erb b/app/views/dmsf_workflows/new.html.erb
index a1bccc18..157c309a 100644
--- a/app/views/dmsf_workflows/new.html.erb
+++ b/app/views/dmsf_workflows/new.html.erb
@@ -20,15 +20,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% 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>
+<% if !@project && params[:dmsf_workflow] && params[:dmsf_workflow][:project_id].present? %>
+    <% @project = Project.find_by_id params[:dmsf_workflow][:project_id] %>
+<% end %>
+<% 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 @dmsf_workflow do |f| %>
-  <%= f.hidden_field(:project_id, :value => project.id) if project %>
+  <%= f.hidden_field(:project_id, :value => @project.id) if @project %>
   <%= error_messages_for 'dmsf_workflow' %>
   <div class="box tabular">
     <p>