Merge pull request #654 from coral-erm/sirsidynix

Add qualifiers to license Expressions tab for "view only" user
coral-erm · Aug 13, 2020 · 26d43f9 · 26d43f9
2 parents 290f668 + b1a1f01
commit 26d43f9
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/licensing/ajax_htmldata.php b/licensing/ajax_htmldata.php
@@ -1082,8 +1082,8 @@
 				<tr>
 				<th style='width:80px;'><?php echo _("Type");?></th>
 				<th><?php echo _("Document Text");?></th>
+				<th><?php echo _("Qualifier");?></th>
 				<?php if ($user->canEdit()){ ?>
-					<th><?php echo _("Qualifier");?></th>
 					<th>&nbsp;</th>
 				<?php } ?>
 				</tr>
@@ -1135,20 +1135,18 @@
 
 					<?php
 					echo "<td class='alt'>" . nl2br($expressionIns['documentText']) . "</td>";
+					echo "<td class='alt'>";
 
-					if ($user->canEdit()){
-						echo "<td class='alt'>";
-
-						if (count($qualifierArray) > 0){
-							echo implode("<br />", $qualifierArray);
-						}else{
-							echo "&nbsp;";
-						}
-
+					if (count($qualifierArray) > 0){
+						echo implode("<br />", $qualifierArray);
+					}
 
-						echo "</td>";
+					echo "</td>";
+
+					if ($user->canEdit()){
 						echo "<td class='alt' style='text-align:center;'><a href='ajax_forms.php?action=getExpressionForm&licenseID=" . $licenseID . "&expressionID=" . $expressionIns['expressionID'] . "&height=420&width=345&modal=true' class='thickbox'><img id='Edit' src='images/edit.gif' title= '"._("Edit")."' /></a>&nbsp;&nbsp;<a href='javascript:deleteExpression(" . $expressionIns['expressionID'] . ");'><img id='Remove' class='removeIcon' src='images/cross.gif' title= '"._("Remove")."' /></a></td>";
 					}
+
 					echo "</tr>";
 
 					if ($user->canEdit()){
@@ -1180,7 +1178,7 @@
 					if ($user->canEdit()){
 						echo "<tr><td colspan='4'>&nbsp;</td></tr>";
 					}else{
-						echo "<tr><td colspan='2'>&nbsp;</td></tr>";
+						echo "<tr><td colspan='3'>&nbsp;</td></tr>";
 					}