[evolvis-commits] r11271: [#1558] ↵ The ArtifactFactory wasn�t returning the value needed to correctly create the select boxes↵ removed old fix↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:06:37 CET 2011


Author: mirabilos
Date: 2011-02-24 18:06:37 +0100 (Thu, 24 Feb 2011)
New Revision: 11271

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class
Log:
[#1558]
The ArtifactFactory wasn�t returning the value needed to correctly create the select boxes
removed old fix


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class	2011-02-24 17:06:36 UTC (rev 11270)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/ArtifactFactory.class	2011-02-24 17:06:37 UTC (rev 11271)
@@ -54,6 +54,7 @@
 	var $max_rows;
 	var $fetched_rows;
 	var $extra_fields;
+	var $defaultquery;
 
 	/**
 	 *  Constructor.
@@ -109,6 +110,7 @@
 			*/
 			if (session_loggedin()) {
 				$default_query=$u->getPreference('art_query'.$this->ArtifactType->getID());
+				$this->defaultquery = $default_query;
 				if ($default_query) {
 					$aq = new ArtifactQuery($this->ArtifactType,$default_query);
 					$_extra_fields=$aq->getExtraFields();
@@ -197,8 +199,16 @@
 		$this->last_changed = time() - $this->changed_from;
 	}
 
-
 	/**
+	 *	getdefaultquery - get the default query
+	 *
+	 *	@return	int	
+	 */
+	function getdefaultquery() {
+		return $this->defaultquery;
+	}
+	
+	/**
 	 *	getArtifacts - get an array of Artifact objects.
 	 *
 	 *	@return	array	The array of Artifact objects.

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 17:06:36 UTC (rev 11270)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php	2011-02-24 17:06:37 UTC (rev 11271)
@@ -18,6 +18,17 @@
 }
 $run = getStringFromRequest('run');
 $query_id = getIntFromRequest('query_id');
+/*if (!$query_id) {
+	//if there´s no query_id then we´ll fetch the user data to see if he has some saved preference
+	if (!session_loggedin()) {
+			$query_id = ""; // the user isn´t logged in, no preference set for him
+	} else {
+		$usr =& session_get_user();
+		$query_id = $usr->getPreference("art_query".$ath->getID());
+	}
+}*/
+
+
 if($run && $query_id) {
 	$aq = new ArtifactQuery($ath,$query_id);
 	if (!$aq || !is_object($aq)) {
@@ -166,7 +177,7 @@
 	<tr>';
 	if (db_numrows($res)>0) {
 	echo '
-		<td align="right"><span style="font-size:smaller">'.html_build_select_box($res,'query_id',$query_id,false).'</span></td>'.
+		<td align="right"><span style="font-size:smaller">'.html_build_select_box($res,'query_id',$af->getdefaultquery(),false).'</span></td>'.
 		'<td align="left"><span style="font-size:smaller"><input type="submit" name="run" value="'.$Language->getText('tracker','run_query').'"></input></span></td>';
 	} else {
 		echo '<td colspan="2"> </td>';
@@ -262,14 +273,14 @@
 			<tr><td colspan="2">';
 		if ($offset > 0) {
 			echo '<a href="'.getStringFromServer('PHP_SELF').'?func=browse&group_id='.$group_id.'&atid='.$ath->getID().'&set='.
-			$set.'&offset='.($offset-50).'&query_id=' . getIntFromRequest('query_id').'"><strong><-- '.$Language->getText('tracker_browse','previous').'</strong></a>';
+			$set.'&offset='.($offset-50).'"><strong><-- '.$Language->getText('tracker_browse','previous').'</strong></a>';
 		} else {
 			echo ' ';
 		}
 		echo '</td><td> </td><td colspan="2">';
 		if ($rows >= 50) {
 			echo '<a href="'.getStringFromServer('PHP_SELF').'?func=browse&group_id='.$group_id.'&atid='.$ath->getID().'&set='.
-			$set.'&offset='.($offset+50).'&query_id=' . getIntFromRequest('query_id'). '"><strong>'.$Language->getText('tracker_browse','next').' --></strong></a>';
+			$set.'&offset='.($offset+50).'"><strong>'.$Language->getText('tracker_browse','next').' --></strong></a>';
 		} else {
 			echo ' ';
 		}

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 17:06:36 UTC (rev 11270)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/include/ArtifactTypeHtml.class	2011-02-24 17:06:37 UTC (rev 11271)
@@ -46,7 +46,7 @@
 		$links  = array();
 
 		$labels[] = $this->getName().': '.$Language->getText('tracker_artifacttype','browse');
-		$links[]  = '/tracker/?func=browse&group_id='.$group_id.'&atid='. $this->getID() . '&query_id=' . getIntFromRequest('query_id');
+		$links[]  = '/tracker/?func=browse&group_id='.$group_id.'&atid='. $this->getID();
 		$labels[] = $Language->getText('tracker_artifacttype','csv');
 		$links[]  = '/tracker/?func=downloadcsv&group_id='.$group_id.'&atid='. $this->getID();
 		if ($this->allowsAnon() || session_loggedin()) {



More information about the evolvis-commits mailing list