[evolvis-commits] r17874: theme-tracker pending merges:↵ Thorsten Glaser 2011-12-09 [#2320] when changing Data Type track that upon jumpback to details↵ Thorsten Glaser 2011-12-09 [#2322] make Submitter/Assignee sort use unixname not user_id
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Dec 9 18:37:35 CET 2011
Author: mirabilos
Date: 2011-12-09 18:37:35 +0100 (Fri, 09 Dec 2011)
New Revision: 17874
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/tracker.php
Log:
theme-tracker pending merges:
Thorsten Glaser 2011-12-09 [#2320] when changing Data Type track that upon jumpback to details
Thorsten Glaser 2011-12-09 [#2322] make Submitter/Assignee sort use unixname not user_id
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php 2011-12-09 17:37:31 UTC (rev 17873)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactFactory.class.php 2011-12-09 17:37:35 UTC (rev 17874)
@@ -220,8 +220,8 @@
'summary',
'open_date',
'close_date',
- 'assigned_to',
- 'submitted_by',
+ 'assigned_unixname',
+ 'submitted_unixname',
'priority') ;
$efarr = $this->ArtifactType->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_TEXT,
ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
@@ -479,18 +479,18 @@
'summary',
'open_date',
'close_date',
- 'assigned_to',
- 'submitted_by',
+ 'assigned_unixname',
+ 'submitted_unixname',
'priority'));
if ($sortcol != 'extra') {
- $ordersql = " ORDER BY Artifacts.group_artifact_id $sortorder, Artifacts.$sortcol $sortorder" ;
+ $ordersql = " ORDER BY Artifacts.group_artifact_id $sortorder, Artifacts.$sortcol $sortorder";
} else {
$ordersql = '' ;
}
- $result = db_query_params ('SELECT * FROM (' . $selectsql . $wheresql . ') AS Artifacts' . $ordersql,
- $params) ;
+ $sql = 'SELECT * FROM (' . $selectsql . $wheresql . ') AS Artifacts' . $ordersql;
+ $result = db_query_params($sql, $params);
$rows = db_numrows($result);
$this->fetched_rows=$rows;
if (db_error()) {
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2011-12-09 17:37:31 UTC (rev 17873)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2011-12-09 17:37:35 UTC (rev 17874)
@@ -314,8 +314,8 @@
$order_arr[]='summary';
$order_arr[]='open_date';
$order_arr[]='close_date';
-$order_arr[]='submitted_by';
-$order_arr[]='assigned_to';
+$order_arr[]='submitted_unixname';
+$order_arr[]='assigned_unixname';
//
// custom sort arrays to build pop-up box
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/tracker.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/tracker.php 2011-12-09 17:37:31 UTC (rev 17873)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/tracker.php 2011-12-09 17:37:35 UTC (rev 17874)
@@ -442,6 +442,18 @@
//include $gfwww.'tracker/browse.php';
$is_add = false;
+ /* in case the Data Type was changed */
+ $new_atid = $ah->getArtifactType()->getID();
+ if ($new_atid != $atid) {
+ $new_ath = new ArtifactTypeHtml($group,
+ $new_atid);
+ if ($new_ath && is_object($new_ath) &&
+ !$new_ath->isError()) {
+ $ath = $new_ath;
+ }
+ /* used by the form field */
+ $atid = $new_atid;
+ }
include $gfwww.'tracker/item.php';
break;
}
More information about the evolvis-commits
mailing list