This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 08826d562e8daa8d700a23386c429d0b79857d72 (commit)
from db054f0d17b208671ee89898569adacb09657326 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=08826d562e8daa8d700a23386c429d0b79857d72
commit 08826d562e8daa8d700a23386c429d0b79857d72
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Thu Nov 10 14:49:05 2016 +0100
Tracker: fix artifact browse
diff --git a/src/common/tracker/ArtifactFactory.class.php
b/src/common/tracker/ArtifactFactory.class.php
index 8ae5fca..cbd1c7d 100644
--- a/src/common/tracker/ArtifactFactory.class.php
+++ b/src/common/tracker/ArtifactFactory.class.php
@@ -458,7 +458,7 @@ class ArtifactFactory extends FFError {
$sortcol = 'submitted_realname';
break;
case 'last_modified_by':
- $sortcol = 'assigned_realname';
+ $sortcol = 'last_modified_realname';
break;
}
$ordersql = " ORDER BY Artifacts.group_artifact_id
$sortorder, Artifacts.$sortcol $sortorder" ;
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 0dff514..876501f 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -548,9 +548,8 @@ if ($art_arr && $art_cnt > 0) {
}
$pager = '';
-
$browse_fields = explode(',', "id,".$ath->getBrowseList());
- if (!in_array($_sort_col,$browse_fields)) {
+ if (!in_array($_sort_col,$browse_fields) && $_sort_col!='artifact_id') {
$browse_fields[] = $_sort_col;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactFactory.class.php | 2 +-
src/common/tracker/actions/browse.php | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
