From 41d6f05f88d45a21e9ddebd8ce4219269a140833 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Jan 2016 16:20:51 +0100
Subject: [PATCH] choose mandatory workflow from list if more than 1 workflow
 is possible

---
 views/bootstrap/class.AddDocument.php    | 23 +++++++++++++++------
 views/bootstrap/class.UpdateDocument.php | 26 ++++++++++++++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 425e1d071..f67251b98 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -232,12 +232,25 @@ $(document).ready(function() {
       </td>
       <td>
 <?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
+				$mandatoryworkflows = $user->getMandatoryWorkflows();
+				if($mandatoryworkflows) {
+					if(count($mandatoryworkflows) == 1) {
 ?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+				<?php echo htmlspecialchars($mandatoryworkflows[0]->getName()); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflows[0]->getID(); ?>">
 <?php
+					} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
+					foreach ($mandatoryworkflows as $workflow) {
+						print "<option value=\"".$workflow->getID()."\"";
+						print ">". htmlspecialchars($workflow->getName())."</option>";
+					}
+?>
+        </select>
+<?php
+					}
 				} else {
 ?>
         <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
@@ -246,8 +259,6 @@ $(document).ready(function() {
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
 						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
 						print ">". htmlspecialchars($workflow->getName())."</option>";
 					}
 ?>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 238e8d19f..cf60e86f0 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -525,12 +525,28 @@ $(document).ready( function() {
       </td>
       <td>
 <?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
+				$mandatoryworkflows = $user->getMandatoryWorkflows();
+				if($mandatoryworkflows) {
+					if(count($mandatoryworkflows) == 1) {
 ?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+				<?php echo htmlspecialchars($mandatoryworkflows[0]->getName()); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflows[0]->getID(); ?>">
 <?php
+					} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
+					$curworkflow = $latestContent->getWorkflow();
+					foreach ($mandatoryworkflows as $workflow) {
+						print "<option value=\"".$workflow->getID()."\"";
+						if($curworkflow && $curworkflow->getID() == $workflow->getID())
+							echo " selected=\"selected\"";
+						print ">". htmlspecialchars($workflow->getName())."</option>";
+					}
+?>
+        </select>
+<?php
+					}
 				} else {
 ?>
         <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
@@ -539,8 +555,6 @@ $(document).ready( function() {
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
 						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
 						print ">". htmlspecialchars($workflow->getName())."</option>";
 					}
 ?>