[evolvis-commits] r17291: Sort submitter [#1460] and tracker drop-down boxen in tracker/browse
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Jun 10 13:04:19 CEST 2011
Author: mirabilos
Date: 2011-06-10 13:04:19 +0200 (Fri, 10 Jun 2011)
New Revision: 17291
Modified:
trunk/gforge_base/evolvisforge/gforge/debian/changelog
trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
Log:
Sort submitter [#1460] and tracker drop-down boxen in tracker/browse
Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog 2011-06-09 22:08:33 UTC (rev 17290)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog 2011-06-10 11:04:19 UTC (rev 17291)
@@ -1,3 +1,10 @@
+gforge (4.8.3+evolvis35) xunstable; urgency=low
+
+ [ Thorsten Glaser ]
+ * [#1460] Sort drop-down boxen in tracker/browse
+
+ -- Thorsten Glaser <t.glaser at tarent.de> Fri, 10 Jun 2011 13:03:30 +0200
+
gforge (4.8.3+evolvis34) unstable; urgency=low
[ Patrick Apel ]
Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php 2011-06-09 22:08:33 UTC (rev 17290)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php 2011-06-10 11:04:19 UTC (rev 17291)
@@ -6,7 +6,10 @@
* Copyright 1999-2001 (c) VA Linux Systems
* http://sourceforge.net
*
+ * Copyright (c) 2011
+ * Thorsten Glaser <t.glaser at tarent.de>
*/
+
require_once $gfcommon.'tracker/ArtifactFactory.class.php';
require_once $gfcommon.'tracker/ArtifactQuery.class.php';
//
@@ -54,8 +57,7 @@
$atf = new ArtifactTypeFactory($group);
$at_arr =& $atf->getArtifactTypes(); //Gets the ids of all artifact types for example.
-$arrSubTrackerIds = array();
-$arrSubTrackerNames = array();
+$arrSubTrackerC = array();
$arrObjAth = array();
$arrObjAf = array();
@@ -63,9 +65,9 @@
$onlyOneTracker = false;
foreach ($at_arr as $at) {
- array_push($arrSubTrackerIds, $at->getID());
- array_push($arrSubTrackerNames, $at->getName());
+ $arrSubTrackerC[$at->getID()] = $at->getName();
}
+natcasesort($arrSubTrackerC);
$creators_id_arr = array();
$creators_name_arr = array();
@@ -86,7 +88,7 @@
if (!in_array($creator_id, $creators_id_arr)) {
array_push($creators_id_arr, $creator_id);
array_push($creators_name_arr, $creators_name_arr_tmp[$j]);
- }
+ }
$j++;
}
@@ -115,6 +117,8 @@
}
$i++;
}
+$creators_c_arr = array_combine($creators_id_arr, $creators_name_arr);
+natcasesort($creators_c_arr);
$offset = getStringFromRequest('offset');
$max_rows = getStringFromRequest('max_rows', 25);
@@ -224,11 +228,11 @@
$extOnChangeParams = array();
$extOnChangeParams = array('group_id' => $group_id);
-$arrSubTrackerBox = html_build_select_box_from_arrays($arrSubTrackerIds, $arrSubTrackerNames, 'selected_tracker', $selected_tracker, false, _('Unassigned'),true, _('Any'), $onChangeValue, $extOnChangeParams);
+$arrSubTrackerBox = html_build_select_box_from_arrays(array_keys($arrSubTrackerC), array_values($arrSubTrackerC), 'selected_tracker', $selected_tracker, false, _('Unassigned'),true, _('Any'), $onChangeValue, $extOnChangeParams);
$tech_box = html_build_select_box_from_arrays ($tech_id_arr,$tech_name_arr,'_assigned_to',$_assigned_to,true,_('Unassigned'),true,_('Any'));
-$arrSubmitterBox = html_build_select_box_from_arrays($creators_id_arr, $creators_name_arr, '_submitted_by', $_submitted_by, true, _('Unassigned'), true, _('Any'));
+$arrSubmitterBox = html_build_select_box_from_arrays(array_keys($creators_c_arr), array_values($creators_c_arr), '_submitted_by', $_submitted_by, true, _('Unassigned'), true, _('Any'));
//
// custom order by arrays to build a pop-up box
@@ -319,11 +323,11 @@
<table width="100%" border="0">
<tr>';
echo '<td rowspan="2" class="hidePartForPrinting">';
- $res=db_query("SELECT artifact_query_id,query_name
+ $res=db_query("SELECT artifact_query_id,query_name
FROM artifact_query WHERE (user_id='".user_getid()."' AND group_artifact_id='".$ath->getID()."') OR user_id=100");
if (db_numrows($res)>0) {
- echo
+ echo
html_build_select_box($res,'query_id',$af->getDefaultQuery(),false).'
<input type="submit" name="run" value="'._('Power Query').'" /> ';
}
@@ -501,7 +505,7 @@
foreach ($artaf_arr as $art_arr_) {
$entries += count($art_arr_);
}
-
+
if($entries === 0) {
echo '<tr><td> </td></tr>';
}
@@ -516,7 +520,7 @@
$selected_tracker == 0 && ($search_tracker == 1 || $func_ == 'massupdate' || $search_all == 1) ? $trackerName = $at_arr[$tracker_count]->getName() : $trackerName = '';
if ($max > 0 && $total != ($page_count * $maxEntriesOnPage)) {
- echo '<tr><td colspan="'.$rowCount.'"><br /><b><i>'.$trackerName.'</i></b></td></tr>';
+ echo '<tr><td colspan="'.$rowCount.'"><br /><b><i>'.$trackerName.'</i></b></td></tr>';
}
for ($i = $start; $i < $max; $i++) {
More information about the evolvis-commits
mailing list