[evolvis-commits] r17593: merge from svn; pending merges:↵ messer 2011-10-14 #1824 Fixed. Permission check was broken, Table was rendered incorrectly.

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Oct 19 10:02:48 CEST 2011


Author: mirabilos
Date: 2011-10-19 10:02:48 +0200 (Wed, 19 Oct 2011)
New Revision: 17593

Added:
   trunk/gforge_base/evolvisforge-5.1/
Removed:
   trunk/gforge_base/evolvisforge-5.1/
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
Log:
merge from svn; pending merges:
  messer 2011-10-14 #1824 Fixed. Permission check was broken, Table was rendered incorrectly.



Property changes on: trunk/gforge_base/evolvisforge-5.1
___________________________________________________________________
Added: bzr:pointless
   + 6
Added: svn:mergeinfo
   + /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592

Added: svk:merge
   + 8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226


Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-10-10 13:07:54 UTC (rev 17589)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-10-19 08:02:48 UTC (rev 17593)
@@ -294,8 +294,8 @@
 		}
 
 		$taskcount = db_numrows($ah->getRelatedTasks());
-		
-		if (forge_check_perm ('tracker_admin', $this->ArtifactType->Group->getID())) {
+
+		if (forge_check_perm ('tracker_admin', $this->Group->getID())) {
 			$is_admin=false;
 		} else {
 			$is_admin=true;
@@ -307,7 +307,6 @@
 			echo '<tr><td colspan="2">';
 			echo '<b>'._("Related Tasks").':</b>'.'<br/>';
 			$title_arr = array();
-			$title_arr[] = _('Task Id');
 			$title_arr[] = _('Task Summary');
 			$title_arr[] = _('Start Date');
 			$title_arr[] = _('End Date');
@@ -315,7 +314,7 @@
 			(($is_admin) ? $title_arr[]=_('Remove Relation') : '');
 			echo $GLOBALS['HTML']->listTableTop($title_arr);
 
-			echo '<table cellspacing="0">';
+			//echo '<table cellspacing="0">';
 			for ($i = 0; $i < $taskcount; $i++) {
 				$taskinfo  = db_fetch_array($ah->relatedtasks, $i);
 				$totalPercentage += $taskinfo['percent_complete'];
@@ -335,6 +334,7 @@
 					(($is_admin) ? '<td><input type="checkbox" name="remlink[]" value="'.$taskid.'" /></td>' : '').
 					'</tr>';
 			}
+                        echo '</table>';
 			echo $GLOBALS['HTML']->listTableBottom();
 
 			echo "\n<hr /><p style=\"text-align:right;\">";



More information about the evolvis-commits mailing list