[evolvis-commits] r10602: fixed [#792] 'My personal page' submitted items includes those submitted ?==?UTF-8?Q?to deleted projects↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 17:52:05 CET 2011


Author: mirabilos
Date: 2011-02-24 17:52:05 +0100 (Thu, 24 Feb 2011)
New Revision: 10602

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php
Log:
fixed [#792] 'My personal page' submitted items includes those submitted to deleted projects


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php	2011-02-24 16:52:04 UTC (rev 10601)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/my/index.php	2011-02-24 16:52:05 UTC (rev 10602)
@@ -76,27 +76,30 @@
 	$assignedArtifacts =& $artifactsForUser->getAssignedArtifactsByGroup();
 	if (count($assignedArtifacts) > 0) {
 		foreach($assignedArtifacts as $art) {
-			echo '</td></tr>';
-			if ($art->ArtifactType->getID() != $last_group) {
+			if($art->ArtifactType->Group->getStatus() == 'A') {
+				echo '</td></tr>';
+				if ($art->ArtifactType->getID() != $last_group) {
+					echo '
+					<tr><td colspan="2"><strong><a href="/tracker/?group_id='.
+					$art->ArtifactType->Group->getID().'&atid='.
+					$art->ArtifactType->getID().'">'.
+					$art->ArtifactType->Group->getPublicName().' - '.
+					$art->ArtifactType->getName().'</a></strong></td></tr>';
+	
+				}
 				echo '
-				<tr><td colspan="2"><strong><a href="/tracker/?group_id='.
-				$art->ArtifactType->Group->getID().'&atid='.
-				$art->ArtifactType->getID().'">'.
-				$art->ArtifactType->Group->getPublicName().' - '.
-				$art->ArtifactType->getName().'</a></strong></td></tr>';
-
+				<tr style="background-color:'.html_get_priority_color($art->getPriority()).'">
+				<td width="10%">'.$art->getID().'</td>
+				<td><a href="/tracker/?func=detail&aid='.
+				$art->getID().
+				'&group_id='.$art->ArtifactType->Group->getID().
+				'&atid='.$art->ArtifactType->getID().'">' . $art->getSummary() . '</a>';
+	
+				$last_group = $art->ArtifactType->getID();
 			}
-			echo '
-			<tr style="background-color:'.html_get_priority_color($art->getPriority()).'">
-			<td width="10%">'.$art->getID().'</td>
-			<td><a href="/tracker/?func=detail&aid='.
-			$art->getID().
-			'&group_id='.$art->ArtifactType->Group->getID().
-			'&atid='.$art->ArtifactType->getID().'">' . $art->getSummary() . '</a>';
-
-			$last_group = $art->ArtifactType->getID();
 		}
-	} else {
+	}
+	if($last_group == '0') {
 		echo '
 			<strong>'.$Language->getText('my', 'no_tracker_items_assigned').'</strong>';
 	}
@@ -106,26 +109,29 @@
 	$submittedArtifacts =& $artifactsForUser->getSubmittedArtifactsByGroup();
 	if (count($submittedArtifacts) > 0) {
 		foreach ($submittedArtifacts as $art) {
-			echo '</td></tr>';
-			if ($art->ArtifactType->getID() != $last_group) {
+			if($art->ArtifactType->Group->getStatus() == 'A') {
+				echo '</td></tr>';
+				if ($art->ArtifactType->getID() != $last_group) {
+					echo '
+					<tr><td colspan="2"><strong><a href="/tracker/?group_id='.
+					$art->ArtifactType->Group->getID().'&atid='.
+					$art->ArtifactType->getID().'">'.
+					$art->ArtifactType->Group->getPublicName().' - '.
+					$art->ArtifactType->getName().'</a></strong></td></tr>';
+				}
 				echo '
-				<tr><td colspan="2"><strong><a href="/tracker/?group_id='.
-				$art->ArtifactType->Group->getID().'&atid='.
-				$art->ArtifactType->getID().'">'.
-				$art->ArtifactType->Group->getPublicName().' - '.
-				$art->ArtifactType->getName().'</a></strong></td></tr>';
+				<tr style="background-color:'.html_get_priority_color($art->getPriority()).'">
+				<td width="10%">'.$art->getID().'</td>
+				<td><a href="/tracker/?func=detail&aid='.
+	      $art->getID().
+	      '&group_id='.$art->ArtifactType->Group->getID().
+	      '&atid='.$art->ArtifactType->getID().'">' . $art->getSummary() .'</a>';
+	
+				$last_group = $art->ArtifactType->getID();
 			}
-			echo '
-			<tr style="background-color:'.html_get_priority_color($art->getPriority()).'">
-			<td width="10%">'.$art->getID().'</td>
-			<td><a href="/tracker/?func=detail&aid='.
-      $art->getID().
-      '&group_id='.$art->ArtifactType->Group->getID().
-      '&atid='.$art->ArtifactType->getID().'">' . $art->getSummary() .'</a>';
-
-			$last_group = $art->ArtifactType->getID();
 		}
-	} else {
+	}
+	if($last_group == '0') {
 		echo '
 		<strong>'.$Language->getText('my', 'no_tracker_items_submitted').'</strong>';
 	}



More information about the evolvis-commits mailing list