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 39840769408e690bb48ae2efa412565b9b8e046b (commit)
via 06e9b40b6289a06be6ba9c14508a6e2d962e35ed (commit)
from 06beafb18e6310c6f493ab569f70c664ca3b386f (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=39840769408e690bb48ae2efa412565b9b8e046b
commit 39840769408e690bb48ae2efa412565b9b8e046b
Author: Franck Villaume <[email protected]>
Date: Tue Jul 12 20:33:42 2016 +0200
make the getNavigationPanel optional
diff --git
a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
index 5161e5a..9eb1e36 100644
--- a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
@@ -73,14 +73,14 @@ class FullProjectHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
*/
function flush() {
$this->writeHeader();
- $this->writeBody();
+ $this->writeBody(true);
$this->writeFooter();
}
/**
* writeBody - write the Body of the output
*/
- function writeBody() {
+ function writeBody($withpanel = true) {
global $HTML;
if (!$this->words) {
echo $HTML->error_msg(_('Error')._(': ')._('Please
enter a term to search for'));
@@ -195,7 +195,7 @@ class FullProjectHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
$html .= $this->getPartResult($renderer, 'short_news', _('News
Search Results'));
*/
- return $html.'<br />';
+ return $html;
}
/**
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index e1e94a3..c8aee3b 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -75,8 +75,8 @@ class HtmlSearchRenderer extends SearchRenderer {
/**
* writeBody - write the body
*/
- function writeBody() {
- echo $this->writeResults();
+ function writeBody($withpanel = true) {
+ echo $this->writeResults($withpanel);
}
/**
@@ -92,7 +92,7 @@ class HtmlSearchRenderer extends SearchRenderer {
*
* @return string html output
*/
- function writeResults() {
+ function writeResults($withpanel = true) {
global $HTML;
$searchQuery =& $this->searchQuery;
$query =& $this->query;
@@ -109,8 +109,10 @@ class HtmlSearchRenderer extends SearchRenderer {
}
$result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
- if(count($result) > 0 && ($searchQuery->getRowsTotalCount() >
count($result) || $searchQuery->getOffset() != 0 )) {
- $html .= $this->getNavigationPanel();
+ if ($withpanel) {
+ if (count($result) > 0 &&
($searchQuery->getRowsTotalCount() > count($result) ||
$searchQuery->getOffset() != 0 )) {
+ $html .= $this->getNavigationPanel();
+ }
}
return $html;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=06e9b40b6289a06be6ba9c14508a6e2d962e35ed
commit 06e9b40b6289a06be6ba9c14508a6e2d962e35ed
Author: Franck Villaume <[email protected]>
Date: Tue Jul 12 20:33:10 2016 +0200
fix paging
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index 14baefc..9d3f2d1 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -7,7 +7,7 @@
* Copyright 2005, Fabio Bertagnin
* Copyright 2010-2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - 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;
@@ -170,7 +170,7 @@ if (session_loggedin()) {
$LUSER->setPreference('paging', $paging);
}
/* logged in users get configurable paging */
- $paging = $LUSER->getPreference('paging');
+ $paging = (int)$LUSER->getPreference('paging');
}
if(!isset($paging) || !$paging)
@@ -181,8 +181,8 @@ if ($searchString) {
$result =
$docsHtmlSearchRenderer->searchQuery->getData($docsHtmlSearchRenderer->searchQuery->getRowsPerPage(),$docsHtmlSearchRenderer->searchQuery->getOffset());
$nbDocs = count($result);
$max = $docsHtmlSearchRenderer->searchQuery->getRowsTotalCount();
- echo $HTML->paging_top($start, $paging, $nbDocs, $max,
$redirect_url.'&view=search&textsearch='.$searchString);
- $docsHtmlSearchRenderer->writeBody();
- echo $HTML->paging_bottom($start, $paging, $nbDocs,
$redirect_url.'&view=search&textsearch='.$searchString);
+ echo $HTML->paging_top($start, $paging, $max, $nbDocs,
$redirect_url.'&view=search&textsearch='.$searchString);
+ $docsHtmlSearchRenderer->writeBody(false);
+ echo $HTML->paging_bottom($start, $paging, $max,
$redirect_url.'&view=search&textsearch='.$searchString);
}
echo html_ac(html_ap() -2);
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/search.php | 10 +++++-----
.../renderers/FullProjectHtmlSearchRenderer.class.php | 6 +++---
.../search/include/renderers/HtmlSearchRenderer.class.php | 12 +++++++-----
3 files changed, 15 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
