[evolvis-commits] r9007: committing bug fixes for singlestep↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:57:21 CET 2011


Author: mirabilos
Date: 2011-02-24 16:57:21 +0100 (Thu, 24 Feb 2011)
New Revision: 9007

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/editrelease.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/qrs.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/showreleases.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php
Log:
committing bug fixes for singlestep


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class	2011-02-24 15:57:21 UTC (rev 9007)
@@ -719,10 +719,12 @@
 
 		// If the current status is Pending then auto-reset it to 'Open'
 		// Assumes the status ID for 'Pending' is '4'
+		/*
+		//This was unexpected behavior - best to let the admin set their own status
 		if ($status_id != '2' && $status_id != '3'  && $this->getStatusID() == '4') {
 			$status_id = '1';
 		}
-
+		*/
 		//	original submitter can always modify his/her items now
 		if (!$this->ArtifactType->userIsAdmin() && ($this->getSubmittedBy() != user_getid())) {
 			$this->setPermissionDeniedError();
@@ -831,7 +833,7 @@
 		if ($status_id != 1) {
 			$now=time();
 			$sqlu .= " close_date='$now', ";
-			$this->addHistory('close_date',$this->getCloseDate());
+			$this->addHistory('close_date',$now);
 			$update = true;
 		}
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactType.class	2011-02-24 15:57:21 UTC (rev 9007)
@@ -428,7 +428,8 @@
 		if (!isset($this->categories_res)) {
 			$sql="select id,category_name 
 				FROM artifact_category 
-				WHERE group_artifact_id='". $this->getID() ."'";
+				WHERE group_artifact_id='". $this->getID() ."'
+				ORDER BY category_name";
 			$this->categories_res=db_query($sql);
 		}
 		return $this->categories_res;
@@ -473,7 +474,8 @@
 			$sql="SELECT user_id,realname 
 				FROM artifactperm_user_vw
 				WHERE group_artifact_id='". $this->getID() ."' 
-				AND perm_level in (1,2)";
+				AND perm_level in (1,2)
+				ORDER BY realname";
 			$this->technicians_res = db_query($sql);
 		}
 		return $this->technicians_res;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/index_std.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -38,7 +38,7 @@
 echo $HTML->boxTop('Getting GForge');
 ?>
 <strong>Download:</strong><br />
-<a href="http://gforge.org/project/showfiles.php?group_id=1">GForge3.0b1</a><br />
+<a href="http://gforge.org/project/showfiles.php?group_id=1">GForge3.0</a><br />
 <a href="http://postgresql.org/">PostgreSQL</a><br />
 <a href="http://www.php.net/">PHP 4.x</a><br />
 <a href="http://www.apache.org/">Apache</a><br />

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/editrelease.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/editrelease.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/editrelease.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -177,7 +177,7 @@
 <table border="0" cellpadding="1" cellspacing="1">
 <tr>
 	<td width="10%"><strong><?php echo $Language->getText('project_admin_editrelease','release_date') ?>:<strong></td>
-	<td><input type="text" name="release_date" value="<?php echo date('Y-m-d',$frsr->getReleaseDate()) ?>" size="10" maxlength="10" /></td>
+	<td><input type="text" name="release_date" value="<?php echo date('Y-m-d H:i',$frsr->getReleaseDate()) ?>" size="16" maxlength="16" /></td>
 </tr>
 <tr>
 	<td><strong><?php echo $Language->getText('project_admin_editrelease','release_name') ?>:<strong></td>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/qrs.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/qrs.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/qrs.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -162,7 +162,7 @@
 			<h4><?php echo $Language->getText('project_admin_qrs','release_date') ?>:</h4>
 		</td>
 		<td>
-			<input type="text" name="release_date" value="<?php echo date('Y-m-d'); ?>" size="10" maxlength="10" />
+			<input type="text" name="release_date" value="<?php echo date('Y-m-d H:i'); ?>" size="16" maxlength="16" />
 		</td>
 	</tr>
 	<tr>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/showreleases.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/showreleases.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/project/admin/showreleases.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -74,7 +74,7 @@
 				.'&package_id='.$package_id
 				.'&release_id='.db_result($res,$i,'release_id').'">'. 
 				db_result($res,$i,'name').' ['.$Language->getText('general','edit').']</a></td><td>'.
-				date('Y-m-d',db_result($res,$i,'release_date')).'</td></tr>';
+				date('Y-m-d H:i',db_result($res,$i,'release_date')).'</td></tr>';
 }
 
 echo $GLOBALS['HTML']->listTableBottom();

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -151,12 +151,17 @@
 	$then=(time()-$ath->getDuePeriod());
 	$rows=count($art_arr);
 	for ($i=0; $i < $rows; $i++) {
+/*
+	//BAD DESIGN - You don't do subqueries like this - it kills performance.
+	//The proper way is to do it in ArtifactFactory by adding a count(*) and left join to the comments table
+
 		$comment_count = db_numrows($art_arr[$i]->getMessages());
 		if ($comment_count == 0 || $comment_count > 1) {
 			$comment_msg = "$comment_count ".$Language->getText('tracker','comments');
 		} else {
 			$comment_msg = "$comment_count ".$Language->getText('tracker','comment');
 		}
+*/
 		echo '
 		<tr bgcolor="'. html_get_priority_color( $art_arr[$i]->getPriority() ) .'">'.
 		'<td NOWRAP>'.
@@ -169,7 +174,8 @@
 			'&group_id='. $group_id .'&atid='.
 			$ath->getID().'">'.
 			$art_arr[$i]->getSummary() .
-			' ('. $comment_msg . ')</a></td>'.
+	//		' ('. $comment_msg . ')'.
+			'</a></td>'.
 		'<td>'. (($set != 'closed' && $art_arr[$i]->getOpenDate() < $then)?'* ':'  ') .
 				date($sys_datefmt,$art_arr[$i]->getOpenDate()) .'</td>'.
 		'<td>'. $art_arr[$i]->getAssignedRealName() .'</td>'.
@@ -256,7 +262,7 @@
 
 			<tr>
 			<td><strong>'.$Language->getText('tracker','assigned_to').': <a href="javascript:help_window(\'/help/tracker.php?helpname=assignee\')"><strong>(?)</strong></a>
-				</strong><br />'. $ath->technicianBox ('assigned_to','xzxz',true,$Language->getText('tracker_browse','no_change')) .'</td>
+				</strong><br />'. $ath->technicianBox ('assigned_to','100.1',true,$Language->getText('tracker_artifacttype','nobody'),'100.1',$Language->getText('tracker_browse','no_change')) .'</td>
 			<td><strong>'.$Language->getText('tracker','status').': <a href="javascript:help_window(\'/help/tracker.php?helpname=status\')"><strong>(?)</strong></a></strong>
 				<br />'. $ath->statusBox ('status_id','xzxz',true,$Language->getText('tracker_browse','no_change')) .'</td>
 			</tr>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class	2011-02-24 15:57:21 UTC (rev 9007)
@@ -78,12 +78,21 @@
 		return html_build_select_box ($this->getGroups(),$name,$checked,true,$text_100);
 	}
 
-	function technicianBox ($name='assigned_to',$checked='xzxz',$show_100=true,$text_100='none') {
+	function technicianBox ($name='assigned_to',$checked='xzxz',$show_100=true,$text_100='none',$extra_id='',$extra_name='') {
 		global $Language;
 		if ($text_100=='none'){
 			$text_100=$Language->getText('tracker_artifacttype','nobody');
 		}
-		return html_build_select_box ($this->getTechnicians(),$name,$checked,$show_100,$text_100);
+		$result = $this->getTechnicians();
+		//	this was a bad hack to allow you to mass-update to unassigned, which is ID=100, which 
+		//	conflicted with the "No Change" ID of 100.
+		$ids =& util_result_column_to_array($result,0);
+		$names =& util_result_column_to_array($result,1);
+		if ($extra_id) {
+			$ids[]=$extra_id;
+			$names[]=$extra_name;
+		}
+		return html_build_select_box_from_arrays ($ids,$names,$name,$checked,$show_100,$text_100);
 	}
 
 	function cannedResponseBox ($name='canned_response',$checked='xzxz') {

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php	2011-02-24 15:57:19 UTC (rev 9006)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/index.php	2011-02-24 15:57:21 UTC (rev 9007)
@@ -111,7 +111,9 @@
 					$_category_id=(($category_id != 100) ? $category_id : $ah->getCategoryID());
 					$_artifact_group_id=(($artifact_group_id != 100) ? $artifact_group_id : $ah->getArtifactGroupID());
 					$_resolution_id=(($resolution_id != 100) ? $resolution_id : $ah->getResolutionID());
-					$_assigned_to=(($assigned_to != 100) ? $assigned_to : $ah->getAssignedTo());
+					//yikes, we want the ability to mass-update to "un-assigned", which is the ID=100, which
+					//conflicts with the "no change" ID! Sorry for messy use of 100.1
+					$_assigned_to=(($assigned_to != '100.1') ? $assigned_to : $ah->getAssignedTo());
 					$_summary=addslashes($ah->getSummary());
 
 					if (!$ah->update($_priority,$_status_id,$_category_id,$_artifact_group_id,$_resolution_id,$_assigned_to,$_summary,$canned_response,'',$artifact_type_id)) {



More information about the evolvis-commits mailing list