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 4a94454258317a42fb00061691d07b97a40ee33b (commit)
via 790e10ad8c2c71287708b862164311c402e85f0a (commit)
from 466ec640ce63e7e7ba540935534f9d82a9fee781 (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=4a94454258317a42fb00061691d07b97a40ee33b
commit 4a94454258317a42fb00061691d07b97a40ee33b
Author: Franck Villaume <[email protected]>
Date: Tue Jul 12 20:28:46 2016 +0200
use util_make_link
diff --git
a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
index 3805211..a279d03 100644
--- a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
@@ -3,6 +3,7 @@
* Search Engine
*
* Copyright 2004 (c) Dominik Haas, GForge Team
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -41,7 +42,7 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
parent::__construct(SEARCH__TYPE_IS_TRACKERS, $words, $isExact,
$searchQuery, $groupId, 'tracker');
$this->tableHeaders = array(
- ' ',
+ _('Tracker'),
_('#'),
_('Summary'),
_('Submitted by'),
@@ -65,20 +66,19 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
//section changed
$currentTracker = $row['name'];
if ($lastTracker != $currentTracker) {
- $return .= '<tr><td
colspan="5">'.$currentTracker.'</td></tr>';
+ $return .= '<tr><td
colspan="5">'.util_make_link('/tracker/?atid='.$row['group_artifact_id'].'&group_id='.$this->groupId.'&func=browse',$currentTracker).'</td></tr>';
$lastTracker = $currentTracker;
$rowColor = 0;
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
. '<td style="width:
5%"> </td>'
.
'<td>'.$row['artifact_id'].'</td>'
- . '<td>'
- . '<a
href="'.util_make_url
('/tracker/?func=detail&group_id='.$this->groupId.'&aid='.$row['artifact_id']
. '&atid='.$row['group_artifact_id']).'">'
- .
html_image('ic/tracker20g.png').' '.$row['summary']
- . '</a></td>'
+ .
'<td>'.util_make_link('/tracker/?func=detail&group_id='.$this->groupId.'&aid='.$row['artifact_id'].'&atid='.$row['group_artifact_id'],
+
html_image('ic/tracker20g.png').' '.$row['summary'])
+ .'</td>'
. '<td style="width:
15%">'.$row['realname'].'</td>'
. '<td style="width:
15%">'.relative_date($row['open_date']).'</td></tr>';
- $rowColor ++;
+ $rowColor++;
}
return $return;
}
@@ -96,7 +96,7 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
}
/**
- * redirectToResult - redirect the user directly to the result when
there is only one matching result
+ * redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
$result = $this->searchQuery->getData(1)[0];
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=790e10ad8c2c71287708b862164311c402e85f0a
commit 790e10ad8c2c71287708b862164311c402e85f0a
Author: Franck Villaume <[email protected]>
Date: Tue Jul 12 20:24:08 2016 +0200
use getEditFilePic
diff --git a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
index 9606543..eecff0f 100644
--- a/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsHtmlSearchRenderer.class.php
@@ -128,7 +128,7 @@ class DocsHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$cells[][] = $row['description'];
if (forge_check_perm('docman',
$document->Group->getID(), 'approve')) {
if (!$document->getLocked() &&
!$document->getReserved()) {
- $cells[][] =
util_make_link('/docman/?group_id='.$document->Group->getID().'&view=listfile&dirid='.$document->getDocGroupID().'&filedetailid='.$document->getID(),
html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this
document'))), array('title' => _('Edit this document')));
+ $cells[][] =
util_make_link('/docman/?group_id='.$document->Group->getID().'&view=listfile&dirid='.$document->getDocGroupID().'&filedetailid='.$document->getID(),
$HTML->getEditFilePic(_('Edit this document')), array('title' => _('Edit this
document')));
} else {
$cells[][] = ' ';
}
-----------------------------------------------------------------------
Summary of changes:
.../include/renderers/DocsHtmlSearchRenderer.class.php | 2 +-
.../renderers/TrackersHtmlSearchRenderer.class.php | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
