[evolvis-commits] r17974: merge commit from papel who, again, committed into trunk instead of the appropriate (either svn or bzr) branch…

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Jan 9 13:39:13 CET 2012


Author: mirabilos
Date: 2012-01-09 13:39:13 +0100 (Mon, 09 Jan 2012)
New Revision: 17974

Modified:
   trunk/gforge_base/evolvisforge-5.1/
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectGroupHTML.class.php
Log:
merge commit from papel who, again, committed into trunk instead of the appropriate (either svn or bzr) branch…

pending merges:
  papel 2012-01-09 [#2314] Tasks > Task-Detailansicht: falsches Verhalten Prozent fertig -> Status



Property changes on: trunk/gforge_base/evolvisforge-5.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17877,17896
/branches/messer-51:17836,17838,17880-17882,17894-17895
/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17861,17935-17936,17945,17956-17958

   + /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17877,17896,17962
/branches/messer-51:17836,17838,17880-17882,17894-17895
/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17861,17935-17936,17945,17956-17958

Modified: svk:merge
   - 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17936
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17958
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17881
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17895
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:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17877
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17896
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226

   + 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17936
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17958
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17881
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17895
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:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17877
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17896
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17962
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2012-01-09 12:39:06 UTC (rev 17973)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2012-01-09 12:39:13 UTC (rev 17974)
@@ -284,7 +284,7 @@
 	 */
 	function getStatuses () {
 		if (!$this->statuses) {
-			$this->statuses = db_query_params ('SELECT * FROM project_status',
+			$this->statuses = db_query_params ('SELECT * FROM project_status ORDER BY status_id',
 							   array());
 		}
 		return $this->statuses;

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectGroupHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectGroupHTML.class.php	2012-01-09 12:39:06 UTC (rev 17973)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectGroupHTML.class.php	2012-01-09 12:39:13 UTC (rev 17974)
@@ -153,7 +153,7 @@
                         <select name="'.$name.'" onchange="switch(this.selectedIndex){
                                                         case 0: '.$status_select.'.selectedIndex = 0; break;
                                                         case 20: '.$status_select.'.selectedIndex = 4; break;
-                                                        default: '.$status_select.'.selectedIndex = 2;
+                                                        default: '.$status_select.'.selectedIndex = 3;
                         }">';
                 echo '
 		<option value="0">'._('Not Started'). '</option>';



More information about the evolvis-commits mailing list