[Fusionforge-commits] FusionForge branch master updated. 6.0.4-983-gbb4052b
Franck Villaume
nerville at libremir.placard.fr.eu.org
Tue Oct 4 14:07:25 CEST 2016
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 bb4052b53df9c391d551b81588b564bea9844669 (commit)
via 1c71e660852df79cb3d0073472f67dc993315911 (commit)
from 2cb37a16a44e9d57e3dc9060dadb7f59612c93b3 (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=bb4052b53df9c391d551b81588b564bea9844669
commit bb4052b53df9c391d551b81588b564bea9844669
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Tue Oct 4 14:07:20 2016 +0200
align this widget with the user one
diff --git a/src/common/widget/Widget_ProjectLatestDocuments.class.php b/src/common/widget/Widget_ProjectLatestDocuments.class.php
index 23c58c2..a00ad57 100644
--- a/src/common/widget/Widget_ProjectLatestDocuments.class.php
+++ b/src/common/widget/Widget_ProjectLatestDocuments.class.php
@@ -76,8 +76,8 @@ class Widget_ProjectLatestDocuments extends Widget {
} else {
html_use_tablesorter();
$result .= $HTML->getJavascripts();
- $tabletop = array(_('Date'), _('File Name'), _('Title'), _('Author'), _('Path'));
- $classth = array('', '', '', '', '');
+ $tabletop = array(_('Date'), _('File Type'), _('File Name'), _('Title'), _('Author'), _('Path'));
+ $classth = array('', '', '', '', '', '');
if (session_loggedin()) {
$tabletop[] = _('Status');
$classth[] = '';
@@ -105,16 +105,17 @@ class Widget_ProjectLatestDocuments extends Widget {
$path = $ndg->getPath(true, true);
switch ($filetype) {
case "URL": {
- $docurl = util_make_link($filename, $filename, array(), true);
+ $docurl = util_make_link($filename, html_image($doc->getFileTypeImage(), 22, 22, array('alt'=>$doc->getFileType())), array(), true);
break;
}
default: {
- $docurl = util_make_link('/docman/view.php/'.$group_id.'/'.$docid.'/'.urlencode($filename), '<strong>'.$filename.'</strong>');
+ $docurl = util_make_link('/docman/view.php/'.$group_id.'/'.$docid.'/'.urlencode($filename), html_image($doc->getFileTypeImage(), 22, 22, array('alt'=>$doc->getFileType())));
}
}
$cells = array();
$cells[][] = date(_('Y-m-d'),$realdate);
$cells[][] = $docurl;
+ $cells[][] = $filename;
$cells[][] = $title;
$cells[][] = make_user_link($user_name, $realname);
$cells[][] = $path;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1c71e660852df79cb3d0073472f67dc993315911
commit 1c71e660852df79cb3d0073472f67dc993315911
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Tue Oct 4 14:06:55 2016 +0200
remove last type_id
diff --git a/src/common/search/ProjectSearchQuery.class.php b/src/common/search/ProjectSearchQuery.class.php
index a0957ad..092a650 100644
--- a/src/common/search/ProjectSearchQuery.class.php
+++ b/src/common/search/ProjectSearchQuery.class.php
@@ -35,7 +35,7 @@ class ProjectSearchQuery extends SearchQuery {
*/
function getQuery() {
$words = $this->getFTIwords();
- $qpa = db_construct_qpa(false, 'SELECT DISTINCT ON (ts_rank(vectors, q), group_name) type_id, g.group_id, ts_headline(group_name, q) as group_name, unix_group_name, ts_headline(short_description, q) as short_description FROM groups AS g, to_tsquery($1) AS q, groups_idx as i WHERE g.status in ($2, $3) ',
+ $qpa = db_construct_qpa(false, 'SELECT DISTINCT ON (ts_rank(vectors, q), group_name) g.group_id, ts_headline(group_name, q) as group_name, unix_group_name, ts_headline(short_description, q) as short_description FROM groups AS g, to_tsquery($1) AS q, groups_idx as i WHERE g.status in ($2, $3) ',
array ($words, 'A', 'H'));
$qpa = db_construct_qpa($qpa, 'AND vectors @@ q ');
if (count($this->phrases)) {
-----------------------------------------------------------------------
Summary of changes:
src/common/search/ProjectSearchQuery.class.php | 2 +-
src/common/widget/Widget_ProjectLatestDocuments.class.php | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list