[evolvis-commits] r17585: pending merges from SVN:↵ mirabilos 2011-10-06 unbreak filtering with "1,2,3" style strings as filters↵ mirabilos 2011-10-05 changelog entries for Mike’s work↵ messer 2011-09-29 #1850 Fixed. Removed code.↵ messer 2011-09-29 #1906 Fixed. Code was simply missing. Re-added it.↵ messer 2011-09-29 #1859 Fixed. Code was simply missing. Re-added it.

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Oct 7 18:28:46 CEST 2011


Author: mirabilos
Date: 2011-10-07 18:28:46 +0200 (Fri, 07 Oct 2011)
New Revision: 17585

Added:
   trunk/gforge_base/evolvisforge-5.1/
Removed:
   trunk/gforge_base/evolvisforge-5.1/
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactQuery.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-customizelist.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/query.php
Log:
pending merges from SVN:
  mirabilos 2011-10-06 unbreak filtering with "1,2,3" style strings as filters
    mirabilos 2011-10-05 changelog entries for Mike’s work
    messer 2011-09-29 #1850 Fixed. Removed code.
    messer 2011-09-29 #1906 Fixed. Code was simply missing. Re-added it.
    messer 2011-09-29 #1859 Fixed. Code was simply missing. Re-added it.



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

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:7226


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactQuery.class.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactQuery.class.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -58,6 +58,7 @@
 define('ARTIFACT_QUERY_SUMMARY',9);
 define('ARTIFACT_QUERY_DESCRIPTION',10);
 define('ARTIFACT_QUERY_FOLLOWUPS',11);
+define('ARTIFACT_QUERY_CREATOR',12);
 
 require_once $gfcommon.'tracker/ArtifactType.class.php';
 
@@ -607,7 +608,20 @@
 			return false;
 		return $this->element_array[ARTIFACT_QUERY_ASSIGNEE][0];
 	}
-
+        
+        /**
+	 *	getCreator
+	 *
+	 *	@return	string	Creator ID
+	 */
+	function getCreator() {
+		if (!isset($this->element_array))
+			return false;
+		if (!isset($this->element_array[ARTIFACT_QUERY_CREATOR]))
+			return false;
+		return $this->element_array[ARTIFACT_QUERY_CREATOR][0];
+	}
+        
 	/**
 	 *	getStatus
 	 *

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -604,6 +604,7 @@
 	 */
 	function getExtraFields($types=array()) {
 		$filter=implode (',',$types);
+		$types = explode(',', $filter);
 		if (!isset($this->extra_fields["$filter"])) {
 			$this->extra_fields["$filter"] = array();
 			if (count($types)) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-10-07 16:28:46 UTC (rev 17585)
@@ -15,8 +15,12 @@
   * Change art_cust* prefs to use JSON serialisation
   * Move php-htmlpurifier dependency to gforge-common package
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 05 Sep 2011 12:37:03 +0200
+  [ Mike Esser ]
+  * [#1850] Fix merge glitch
+  * [#1859] [#1906] Port code from Evolvis 4.8 to 5.1
 
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 05 Oct 2011 11:33:30 +0200
+
 fusionforge (5.1-0) UNRELEASED; urgency=low
 
   [ Roland Mas ]

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-customizelist.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-customizelist.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-customizelist.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -71,19 +71,6 @@
 		 "<br />\n";
 }	
 
-$keys=array_keys($efarr);
-$rows=count($keys);
-if ($rows > 0) {
-	for ($k=0; $k < $rows; $k++) {
-		$i=$keys[$k];
-		$pos = array_search($i, $browse_fields);
-		echo "<input type=\"text\" name=\"browse_fields[$i]\" value=\"" .
-		 	 (($pos !== false) ? $pos + 1 : '') .
-		 	 "\" size=\"3\" maxlength=\"3\" /> " .
-			 $efarr[$i]['field_name'] .
-			 "<br />\n";
-	}
-}
 ?>
 
 <p>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -70,7 +70,15 @@
 
 		<tr>
 			<td><strong><?php echo _('State') ?>:</strong><br /><?php echo $ah->getStatusName(); ?></td>
-			<td></td>
+			<td>
+				<strong><a href="<?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>">Permalink</a>:</strong><br /><?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>
+			</td>
 		</tr>
 		<tr>
 	        <td>

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-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -688,6 +688,30 @@
 		}
 	}
 
+        function creatorBox ($name='submitted_by[]',$checked='xzxz',$show_100=true,$text_100='none',$extra_id='-1',$extra_name='',$multiple=false) {
+		if ($text_100=='none'){
+			$text_100=_('Nobody');
+		}
+		$result = $this->getArtifactCreators();
+		//	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 != '-1') {
+			$ids[]=$extra_id;
+			$names[]=$extra_name;
+		}
+			
+		if ($multiple) {
+			if (!is_array($checked)) {
+				$checked = explode(',',$checked);
+			}
+			return html_build_multiple_select_box_from_arrays ($ids,$names,$name,$checked,15,$show_100,$text_100);
+		} else {
+			return html_build_select_box_from_arrays ($ids,$names,$name,$checked,$show_100,$text_100);
+		}
+	}
+        
 	function cannedResponseBox ($name='canned_response',$checked='xzxz') {
 		return html_build_select_box ($this->getCannedResponses(),$name,$checked);
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -129,6 +129,13 @@
 		<?php } ?>
 		</td>
 		<td>
+				<strong><a href="<?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>">Permalink</a>:</strong><br /><?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>
 		</td>
 	</tr>
 	<?php

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -162,7 +162,14 @@
 		?>
 		</td>
 		<td>
-		</td>
+				<strong><a href="<?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>">Permalink</a>:</strong><br /><?php
+					echo util_make_url('/tracker/t_follow.php/' .
+					    $ah->getID());
+				?>
+                </td>
 	</tr>
 	<?php
 		$ath->renderRelatedTasks($group, $ah);

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/query.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/query.php	2011-09-05 10:39:38 UTC (rev 17531)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/query.php	2011-10-07 16:28:46 UTC (rev 17585)
@@ -177,10 +177,13 @@
 $_description=$aq->getDescription();
 $_followups=$aq->getFollowups();
 $query_type=$aq->getQueryType();
+$_submitted_by = $aq->getCreator();
+
 //
 //	creating a custom technician box which includes "any" and "unassigned"
 $tech_box=$ath->technicianBox ('_assigned_to[]',$_assigned_to,true,'none','-1',false,true);
 
+$creator_box = $ath->creatorBox ('_submitted_by[]',$_submitted_by,true,'none','-1',false,true);
 
 //
 //	custom order by arrays to build a pop-up box
@@ -330,7 +333,8 @@
 		</td>
 	</tr>';
 }
-	echo '<tr>
+	echo '<tr><td><strong>'._('Creator').'</strong><br />'.$creator_box.'</td><td> </td></tr>	
+             <tr>
 		<td><strong>'._('Assignee').':</strong><br />'. $tech_box .'</td>
 		<td valign="top">';
 		if (!$ath->usesCustomStatuses()) {



More information about the evolvis-commits mailing list