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 bce5ab392a160b315dc9bb16d2c6050604eea9cc (commit)
via 90166d3d3cbb880124722f1de709d013b4b8e0af (commit)
via dbf0b743102dc27cabdfb8bc5af583fafffd2d24 (commit)
via 8aa690cbf7cae0d818e657d349675be96979621c (commit)
via e572d046d259c96bdcf86a59d41c6be2bfd7ca7c (commit)
from 6fab0bb1c43aea017a9cc62f0bca7948e3b7fe3f (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=bce5ab392a160b315dc9bb16d2c6050604eea9cc
commit bce5ab392a160b315dc9bb16d2c6050604eea9cc
Author: Franck Villaume <[email protected]>
Date: Wed Feb 10 11:27:42 2016 +0100
Layout paging top: fix html syntax
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 46be650..32da7cf 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1532,7 +1532,7 @@ if (isset($params['group']) && $params['group']) {
if (strpos($actionUrl, '?')) {
$sep = '&';
}
- if (session_loggedin()) {
+ if ($totalElements && session_loggedin()) {
$html_content .= $this->openForm(array('action' =>
$actionUrl.$sep.'start='.$start, 'method' => 'post'));
}
if ($totalElements) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=90166d3d3cbb880124722f1de709d013b4b8e0af
commit 90166d3d3cbb880124722f1de709d013b4b8e0af
Author: Franck Villaume <[email protected]>
Date: Wed Feb 10 10:52:10 2016 +0100
docman search: support search in pending state documents & in trash
doc_group
diff --git a/src/common/search/DocsSearchQuery.class.php
b/src/common/search/DocsSearchQuery.class.php
index 5e8cfde..9a91f78 100644
--- a/src/common/search/DocsSearchQuery.class.php
+++ b/src/common/search/DocsSearchQuery.class.php
@@ -6,7 +6,7 @@
* Copyright 2009, Roland Mas
* Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
* Copyright 2013, French Ministry of National Education
- * Copyright 2013,2015 Franck Villaume - TrivialDev
+ * Copyright 2013,2015-2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -80,9 +80,9 @@ class DocsSearchQuery extends SearchQuery {
$qpa = db_construct_qpa($qpa, ' AND
doc_groups.doc_group = ANY ($1)', array(db_int_array_to_any_clause($sections)));
}
if ($this->showNonPublic) {
- $qpa = db_construct_qpa($qpa, ' AND doc_data.stateid IN
(1, 4, 5)') ;
+ $qpa = db_construct_qpa($qpa, ' AND doc_data.stateid IN
(1, 3, 4, 5)');
} else {
- $qpa = db_construct_qpa($qpa, ' AND doc_data.stateid =
1') ;
+ $qpa = db_construct_qpa($qpa, ' AND doc_data.stateid =
1 AND doc_groups.stateid = 1');
}
if (isset($options['date_begin']) &&
!isset($options['date_end'])) {
@@ -137,7 +137,7 @@ class DocsSearchQuery extends SearchQuery {
$sql = 'SELECT doc_groups.doc_group, doc_groups.groupname FROM
doc_groups, doc_data'
.' WHERE doc_groups.doc_group = doc_data.doc_group AND
doc_groups.group_id = $1';
if ($showNonPublic) {
- $sql .= ' AND doc_data.stateid IN (1, 4, 5) AND
doc_groups.stateid = 1';
+ $sql .= ' AND doc_data.stateid IN (1, 3, 4, 5)';
} else {
$sql .= ' AND doc_data.stateid = 1 AND
doc_groups.stateid = 1';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dbf0b743102dc27cabdfb8bc5af583fafffd2d24
commit dbf0b743102dc27cabdfb8bc5af583fafffd2d24
Author: Franck Villaume <[email protected]>
Date: Wed Feb 10 10:51:00 2016 +0100
paging top: display if there are retrived some elements
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 5bab928..46be650 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -8,7 +8,7 @@
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
* Copyright © 2011 Thorsten Glaser – tarent GmbH
* Copyright 2011 - Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2012-2015, Franck Villaume - TrivialDev
+ * Copyright 2012-2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -1535,11 +1535,13 @@ if (isset($params['group']) && $params['group']) {
if (session_loggedin()) {
$html_content .= $this->openForm(array('action' =>
$actionUrl.$sep.'start='.$start, 'method' => 'post'));
}
- $html_content .= sprintf(_('Displaying results %1$s out of %2$d
total.'), ($start + 1).'-'.$maxElements, $totalElements);
- if (session_loggedin()) {
- $html_content .= sprintf(' ' . _('Displaying %1$s
results.'), html_build_select_box_from_array(array('10', '25', '50', '100',
'1000'), 'nres', $paging, 1));
- $html_content .= html_e('input', array('type' =>
'submit', 'name' => 'setpaging', 'value' => _('Change')));
- $html_content .= $this->closeForm();
+ if ($totalElements) {
+ $html_content .= sprintf(_('Displaying results %1$s out
of %2$d total.'), ($start + 1).'-'.$maxElements, $totalElements);
+ if (session_loggedin()) {
+ $html_content .= sprintf(' ' . _('Displaying
%1$s results.'), html_build_select_box_from_array(array('10', '25', '50',
'100', '1000'), 'nres', $paging, 1));
+ $html_content .= html_e('input', array('type'
=> 'submit', 'name' => 'setpaging', 'value' => _('Change')));
+ $html_content .= $this->closeForm();
+ }
}
return $html_content;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8aa690cbf7cae0d818e657d349675be96979621c
commit 8aa690cbf7cae0d818e657d349675be96979621c
Author: Franck Villaume <[email protected]>
Date: Wed Feb 10 10:49:55 2016 +0100
soap docman: expose doc_group stateid
diff --git a/src/www/soap/docman/docman.php b/src/www/soap/docman/docman.php
index f770f87..f5a8460 100644
--- a/src/www/soap/docman/docman.php
+++ b/src/www/soap/docman/docman.php
@@ -3,6 +3,7 @@
* SOAP Documentation Include - this file contains wrapper functions for the
SOAP interface
*
* Copyright 2004 (c) GForge, LLC
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://gforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -39,7 +40,8 @@ $server->wsdl->addComplexType(
array(
'doc_group_id' => array('name'=>'doc_group_id', 'type' => 'xsd:int'),
'parent_doc_group' => array('name'=>'parent_doc_group', 'type' =>
'xsd:int'),
- 'groupname' => array('name'=>'groupname', 'type' => 'xsd:string')
+ 'groupname' => array('name'=>'groupname', 'type' => 'xsd:string'),
+ 'stateid' => array('name' => 'stateid', 'type' => 'xsd:int')
)
);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e572d046d259c96bdcf86a59d41c6be2bfd7ca7c
commit e572d046d259c96bdcf86a59d41c6be2bfd7ca7c
Author: Franck Villaume <[email protected]>
Date: Wed Feb 10 10:49:15 2016 +0100
soap: missing licence, remove hardcoded http protocole
diff --git a/src/www/soap/index.php b/src/www/soap/index.php
index 8ffe50d..7c18edd 100644
--- a/src/www/soap/index.php
+++ b/src/www/soap/index.php
@@ -1,8 +1,30 @@
<?php
+/**
+ * SOAP interface
+ *
+ * Previous Copyright FusionForge Team
+ * Copyright 2016, Franck Villaume - TrivialDev
+ * http://gforge.org
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
$no_debug = true;
-// 0. Include GForge files for access to GForge system
+// 0. Include FusionForge files for access to FusionForge system
require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'include/gettext.php';
@@ -14,7 +36,7 @@ sysdebug_off();
// Disable error_reporting as it breaks XML generated output.
error_reporting(0);
-$uri = 'http://'.forge_get_config('web_host');
+$uri = util_make_base_url();
// 1. include client and server
require_once 'nusoap/nusoap.php';
//$debug = true;
-----------------------------------------------------------------------
Summary of changes:
src/common/search/DocsSearchQuery.class.php | 8 ++++----
src/www/include/Layout.class.php | 16 +++++++++-------
src/www/soap/docman/docman.php | 4 +++-
src/www/soap/index.php | 26 ++++++++++++++++++++++++--
4 files changed, 40 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
