From 9c59519526e8dd51028262c1b75d1c1518be216e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Aug 2016 12:44:23 +0200
Subject: [PATCH] show 'show' value when editing attributes

---
 views/bootstrap/class.AttributeGroupMgr.php | 5 -----
 views/bootstrap/class.EditAttributes.php    | 8 +++++++-
 views/bootstrap/class.EditDocument.php      | 8 +++++++-
 views/bootstrap/class.EditFolder.php        | 8 +++++++-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.AttributeGroupMgr.php b/views/bootstrap/class.AttributeGroupMgr.php
index 13a7aabdf..5047cbe07 100644
--- a/views/bootstrap/class.AttributeGroupMgr.php
+++ b/views/bootstrap/class.AttributeGroupMgr.php
@@ -244,11 +244,6 @@ $(document).ready( function() {
 					print "<td>" . htmlspecialchars($member->getName()) ." (".$ot.", ".$t.")"."</td>";
 					print "<td>";
 					$show = $group->getShow($member);
-					$shows = array();
-					for($j=0; $j<4; $j++) {
-						if(1 << $j & $show)
-							$shows[] = 1 << $j;
-					}
 					print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setshow\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('setshow');
 					echo "<select class=\"chzn-select\" multiple=\"multiple\" name=\"shows[]\" data-placeholder=\"".getMLText('select_attrdefgrp_show')."\">";
 					foreach(SeedDMS_Core_AttributeDefinitionGroup::getShowValues() as $j=>$k)
diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index a89c99b9e..c32202b72 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -61,6 +61,12 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 				echo "<tr><td colspan=\"2\"><b>".htmlspecialchars($attrdefgrp['group']->getName())."</b></td></tr>";
 				foreach($attrdefs as $attrdefarr) {
 					$attrdef = $attrdefarr['attrdef'];
+					$show = $attrdefarr['show'];
+					$shows = array();
+					foreach(SeedDMS_Core_AttributeDefinitionGroup::getShowValues() as $j=>$k) {
+						if($show & $j)
+							$shows[] = getMLText('attrdefgrp_show_'.$k);
+					}
 					if(!in_array($attrdef->getID(), $attrdefids)) {
 						$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
 						if(is_array($arr)) {
@@ -72,7 +78,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 						} else {
 ?>
 <tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?><?php echo $shows ? " (".implode(", ", $shows).")" : ''; ?>:</td>
 	<td><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></td>
 </tr>
 <?php
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index be53f9e77..6caf82bcd 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -181,6 +181,12 @@ $(document).ready( function() {
 				echo "<tr><td colspan=\"2\"><b>".htmlspecialchars($attrdefgrp['group']->getName())."</b></td></tr>";
 				foreach($attrdefs as $attrdefarr) {
 					$attrdef = $attrdefarr['attrdef'];
+					$show = $attrdefarr['show'];
+					$shows = array();
+					foreach(SeedDMS_Core_AttributeDefinitionGroup::getShowValues() as $j=>$k) {
+						if($show & $j)
+							$shows[] = getMLText('attrdefgrp_show_'.$k);
+					}
 					if(!in_array($attrdef->getID(), $attrdefids)) {
 						$arr = $this->callHook('editDocumentAttribute', $document, $attrdef);
 						if(is_array($arr)) {
@@ -192,7 +198,7 @@ $(document).ready( function() {
 						} else {
 ?>
 <tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?><?php echo $shows ? " (".implode(", ", $shows).")" : ''; ?>:</td>
 	<td><?php $this->printAttributeEditField($attrdef, $document->getAttribute($attrdef)) ?></td>
 </tr>
 <?php
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 24f9d349f..5f78c08fc 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -135,6 +135,12 @@ $(document).ready(function() {
 				echo "<tr><td colspan=\"2\"><b>".htmlspecialchars($attrdefgrp['group']->getName())."</b></td></tr>";
 				foreach($attrdefs as $attrdefarr) {
 					$attrdef = $attrdefarr['attrdef'];
+					$show = $attrdefarr['show'];
+					$shows = array();
+					foreach(SeedDMS_Core_AttributeDefinitionGroup::getShowValues() as $j=>$k) {
+						if($show & $j)
+							$shows[] = getMLText('attrdefgrp_show_'.$k);
+					}
 					if(!in_array($attrdef->getID(), $attrdefids)) {
 						$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
 						if(is_array($arr)) {
@@ -146,7 +152,7 @@ $(document).ready(function() {
 						} else {
 ?>
 <tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?><?php echo $shows ? " (".implode(", ", $shows).")" : ''; ?>:</td>
 	<td><?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?></td>
 </tr>
 <?php