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, feature/filter-search-results has been updated
via cf1e38a7b586cd5dd5d72a96ed0baeb1b2325b6e (commit)
via 705f6ad115c686abc582fe0a26abc9594ecc3736 (commit)
via 4430cbc5b2e110246f3ba55d051ffac410e464e8 (commit)
via 988a0b85f530dc9061964ed4b32251d07b9e1cd9 (commit)
via c9e5706af371e6d2a78d2e9d6c274bd946998f40 (commit)
via df59a3a1d2dd6d11dc03a2846066c53ddc3cc45d (commit)
from 9108e16340bb577c915782c98e40e25abbeb7c3a (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=cf1e38a7b586cd5dd5d72a96ed0baeb1b2325b6e
commit cf1e38a7b586cd5dd5d72a96ed0baeb1b2325b6e
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 12:28:04 2016 +0200
Update {Forums,Forum}HtmlSearchRenderer with new search
diff --git a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
index ae8c5b5..7a7bf70 100644
--- a/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ForumHtmlSearchRenderer.class.php
@@ -57,44 +57,19 @@ class ForumHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
);
}
- function getFilteredRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
-
- $fields = array ('group_forum_id',
- 'msg_id',
- 'subject',
- 'realname',
- 'post_date');
-
- $fd = array();
- for($i = 0; $i < $rowsCount; $i++) {
- if (forge_check_perm('forum',
- db_result($result, $i,
'group_forum_id'),
- 'read')) {
- $r = array();
- foreach ($fields as $f) {
- $r[$f] = db_result($result, $i, $f);
- }
- $fd[] = $r;
- }
- }
- return $fd;
- }
-
/**
* getRows - get the html output for result rows
*
* @return string html output
*/
function getRows() {
- $fd = $this->getFilteredRows();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$dateFormat = _('Y-m-d H:i');
$return = '';
$i = 0;
- foreach ($fd as $row) {
+ foreach ($result as $row) {
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'><td class="halfwidth"><a
href="'.util_make_url ('/forum/message.php?msg_id=' . $row['msg_id']).'">'
. html_image('ic/msg.png', '10', '12')
. ' '.$row['subject'].'</a></td>'
@@ -127,6 +102,8 @@ class ForumHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
-
session_redirect('/forum/message.php?msg_id='.$this->getResultId('msg_id'));
+ $result = $this->searchQuery->getData(1)[0];
+
+
session_redirect('/forum/message.php?msg_id='.$result['msg_id']);
}
}
diff --git
a/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
index 2844c87..3fee399 100644
--- a/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ForumsHtmlSearchRenderer.class.php
@@ -50,45 +50,19 @@ class ForumsHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
);
}
- function getFilteredRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
-
- $fields = array ('group_forum_id',
- 'msg_id',
- 'forum_name',
- 'subject',
- 'realname',
- 'post_date');
-
- $fd = array();
- for($i = 0; $i < $rowsCount; $i++) {
- if (forge_check_perm('forum',
- db_result($result, $i,
'group_forum_id'),
- 'read')) {
- $r = array();
- foreach ($fields as $f) {
- $r[$f] = db_result($result, $i, $f);
- }
- $fd[] = $r;
- }
- }
- return $fd;
- }
-
/**
* getRows - get the html output for result rows
*
* @return string html output
*/
function getRows() {
- $fd = $this->getFilteredRows();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
$rowColor = 0;
$lastForumName = null;
- foreach ($fd as $row) {
+ foreach ($result as $row) {
//section changed
$currentForumName = $row['forum_name'];
if ($lastForumName != $currentForumName) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=705f6ad115c686abc582fe0a26abc9594ecc3736
commit 705f6ad115c686abc582fe0a26abc9594ecc3736
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 12:23:08 2016 +0200
Update TasksHtmlSearchRenderer with new search
diff --git a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
index f8b2ea5..482c753 100644
--- a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
@@ -54,47 +54,19 @@ class TasksHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
);
}
- function getFilteredRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
-
- $fields = array ('group_project_id',
- 'project_task_id',
- 'project_name',
- 'summary',
- 'realname',
- 'start_date',
- 'end_date',
- 'percent_complete');
-
- $fd = array();
- for($i = 0; $i < $rowsCount; $i++) {
- if (forge_check_perm('pm',
- db_result($result, $i,
'group_project_id'),
- 'read')) {
- $r = array();
- foreach ($fields as $f) {
- $r[$f] = db_result($result, $i, $f);
- }
- $fd[] = $r;
- }
- }
- return $fd;
- }
-
/**
* getRows - get the html output for result rows
*
* @return string html output
*/
function getRows() {
- $fd = $this->getFilteredRows();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
$rowColor = 0;
$lastProjectName = null;
- foreach ($fd as $row) {
+ foreach ($result as $row) {
//section changed
$currentProjectName = $row['project_name'];
if ($lastProjectName != $currentProjectName) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4430cbc5b2e110246f3ba55d051ffac410e464e8
commit 4430cbc5b2e110246f3ba55d051ffac410e464e8
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 12:23:39 2016 +0200
Update ArtifactHtmlSearchRenderer with new search
diff --git
a/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
index 7ed3341..02dcebc 100644
--- a/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
@@ -60,45 +60,19 @@ class ArtifactHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
);
}
- function getFilteredRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
-
- $fields = array ('group_artifact_id',
- 'artifact_id',
- 'name',
- 'summary',
- 'realname',
- 'open_date');
-
- $fd = array();
- for($i = 0; $i < $rowsCount; $i++) {
- if (forge_check_perm('tracker',
- db_result($result, $i,
'group_artifact_id'),
- 'read')) {
- $r = array();
- foreach ($fields as $f) {
- $r[$f] = db_result($result, $i, $f);
- }
- $fd[] = $r;
- }
- }
- return $fd;
- }
-
/**
* getRows - get the html output for result rows
*
* @return string html output
*/
function getRows() {
- $fd = $this->getFilteredRows();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$groupId = $this->groupId;
$return = '';
$i = 0;
- foreach ($fd as $row) {
+ foreach ($result as $row) {
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'
.'<td>'.$row['artifact_id'].'</td>'
.'<td><a href="'.util_make_url
('/tracker/?group_id='.$groupId.'&atid=' . $row['group_artifact_id'] .
'&func=detail&aid=' . $row['artifact_id']).'"> '
@@ -133,7 +107,9 @@ class ArtifactHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
-
session_redirect('/tracker/?group_id='.$this->groupId.'&atid='.$this->artifactId.'&func=detail&aid='.$this->getResultId('artifact_id'));
+ $result = $this->searchQuery->getData(1)[0];
+
+
session_redirect('/tracker/?group_id='.$this->groupId.'&atid='.$result['group_artifact_id'].'&func=detail&aid='.$result['artifact_id']);
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=988a0b85f530dc9061964ed4b32251d07b9e1cd9
commit 988a0b85f530dc9061964ed4b32251d07b9e1cd9
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 12:13:53 2016 +0200
Update TrackersHtmlSearchRenderer with new search
diff --git
a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
index bc4827b..50ce423 100644
--- a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
@@ -52,45 +52,21 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
);
}
- function getFilteredRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
-
- $fields = array ('group_artifact_id',
- 'artifact_id',
- 'name',
- 'summary',
- 'realname',
- 'open_date');
-
- $fd = array();
- for($i = 0; $i < $rowsCount; $i++) {
- if (forge_check_perm('tracker',
- db_result($result, $i,
'group_artifact_id'),
- 'read')) {
- $r = array();
- foreach ($fields as $f) {
- $r[$f] = db_result($result, $i, $f);
- }
- $fd[] = $r;
- }
- }
- return $fd;
- }
-
/**
* getRows - get the html output for result rows
*
* @return string html output
*/
function getRows() {
- $fd = $this->getFilteredRows();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
$rowColor = 0;
$lastTracker = null;
- foreach ($fd as $row) {
+ error_log($result);
+
+ foreach ($result as $row) {
//section changed
$currentTracker = $row['name'];
if ($lastTracker != $currentTracker) {
@@ -128,7 +104,9 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
-
session_redirect('/tracker/?group_id='.$this->groupId.'&atid='.$this->getResultId('group_artifact_id').'&func=detail&aid='.$this->getResultId('artifact_id'));
+ $result = $this->searchQuery->getData(1)[0];
+
+
session_redirect('/tracker/?group_id='.$this->groupId.'&atid='.$result['group_artifact_id'].'&func=detail&aid='.$result['artifact_id']);
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c9e5706af371e6d2a78d2e9d6c274bd946998f40
commit c9e5706af371e6d2a78d2e9d6c274bd946998f40
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 11:53:11 2016 +0200
Update PeopleHtmlSearchRenderer using new search
diff --git
a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
index e5d81b1..a392027 100644
--- a/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
@@ -60,14 +60,15 @@ class PeopleHtmlSearchRenderer extends HtmlSearchRenderer {
* @return string html output
*/
function getRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
- for($i = 0; $i < $rowsCount; $i++) {
+ $i = 0;
+ foreach ($result as $row) {
+ $i++;
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'.
- '<td width="40%"><a href="'.util_make_url_u
(db_result($result, $i, 'user_name'),db_result($result, $i,
'user_id')).'">'.html_image('ic/msg.png', '10', '12').' '.db_result($result,
$i, 'user_name').'</a></td>'.
- '<td width="60%">'.db_result($result, $i,
'realname').'</td>'.
+ '<td width="40%"><a href="'.util_make_url_u
($row['user_name'],$row['user_id']).'">'.html_image('ic/msg.png', '10', '12').'
'.$row['user_name'].'</a></td>'.
+ '<td width="60%">'.$row['realname'].'</td>'.
'</tr>';
}
return $return;
@@ -77,7 +78,10 @@ class PeopleHtmlSearchRenderer extends HtmlSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
- session_redirect('/users/'.$this->getResultId('user_name').'/');
+ $result = $this->searchQuery->getData(1)[0];
+ $user_name = $result['user_name'];
+
+ session_redirect('/users/'.$user_name.'/');
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=df59a3a1d2dd6d11dc03a2846066c53ddc3cc45d
commit df59a3a1d2dd6d11dc03a2846066c53ddc3cc45d
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 11:22:50 2016 +0200
Update ProjectHtmlSearchRenderer using new search
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index eaeee87..a889cd2 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -58,8 +58,7 @@ class HtmlSearchRenderer extends SearchRenderer {
echo $HTML->error_msg($searchQuery->getErrorMessage());
$this->writeFooter();
} else {
- $searchQuery->executeQuery();
- if($searchQuery->getResult() &&
($searchQuery->getRowsTotalCount() == 1 && $searchQuery->getOffset() == 0) &&
$this->implementsRedirectToResult()) {
+ if(count($searchQuery->getData(2)) == 1 &&
$this->implementsRedirectToResult()) {
$this->redirectToResult();
} else {
$this->writeHeader();
@@ -100,7 +99,9 @@ class HtmlSearchRenderer extends SearchRenderer {
$searchQuery =& $this->searchQuery;
$query =& $this->query;
- if(!$searchQuery->getResult() || $searchQuery->getRowsCount() <
1) {
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
+
+ if(count($result) < 1) {
$html = $HTML->information(sprintf(_('No matches found
for “%s”'), $query['words']));
$html .= db_error();
} else {
@@ -109,7 +110,8 @@ class HtmlSearchRenderer extends SearchRenderer {
$html .= $HTML->listTableBottom();
}
- if($searchQuery->getRowsCount() > 0 &&
($searchQuery->getRowsTotalCount() > $searchQuery->getRowsCount() ||
$searchQuery->getOffset() != 0 )) {
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
+ if(count($result) > 0 && ($searchQuery->getRowsTotalCount() >
count($result) || $searchQuery->getOffset() != 0 )) {
$html .= $this->getNavigationPanel();
}
@@ -134,7 +136,9 @@ class HtmlSearchRenderer extends SearchRenderer {
$html .= ' ';
}
$html .= '</td><td class="align-right">';
- if ($searchQuery->getRowsTotalCount() >
$searchQuery->getRowsCount()) {
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
+ error_log(count($result));
+ if ($searchQuery->getRowsTotalCount() >
$this->searchQuery->getRowsPerPage()+$this->searchQuery->getOffset()) {
$html .= util_make_link($this->getNextResultsUrl(),
_('Next Results').' '.html_image('t.png', '15', '15'), array('class' =>
'next'));
} else {
$html .= ' ';
diff --git
a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
index 0fd7bdd..e97d975 100644
--- a/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ProjectHtmlSearchRenderer.class.php
@@ -61,15 +61,12 @@ class ProjectHtmlSearchRenderer extends HtmlSearchRenderer {
* @return string html output
*/
function getRows() {
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$return = '';
$i = 0;
- while ($row = db_fetch_array($result)) {
- if (!forge_check_perm ('project_read',
$row['group_id'])) {
- continue ;
- }
+ foreach ($result as $row) {
$i++;
if ($row['type_id'] == 2) {
$what = 'foundry';
@@ -90,20 +87,21 @@ class ProjectHtmlSearchRenderer extends HtmlSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
-
- $project_name = $this->getResultId('unix_group_name');
- $project_id = $this->getResultId('group_id');
+ $result = $this->searchQuery->getData(1)[0];
+ $project_name = $result['unix_group_name'];
+ $project_id = $result['group_id'];
$project_name = str_replace('<b>', '', $project_name);
$project_name = str_replace('</b>', '', $project_name);
- if ($this->getResultId('type') == 2) {
+ if ($result['type'] == 2) {
session_redirect('/foundry/'.$project_name.'/');
} else {
if (forge_check_perm ('project_read', $project_id)) {
header('Location:
'.util_make_url_g($project_name,$project_id));
} else {
$this->writeHeader();
+
$html = '<h2>'.sprintf(_('Search results for
“%s”'), $project_name).'</h2>';
$html .= '<p><strong>'.sprintf(_('No matches
found for “%s”'), $project_name).'</strong></p>';
echo $html;
-----------------------------------------------------------------------
Summary of changes:
.../renderers/ArtifactHtmlSearchRenderer.class.php | 34 +++-----------------
.../renderers/ForumHtmlSearchRenderer.class.php | 33 +++-----------------
.../renderers/ForumsHtmlSearchRenderer.class.php | 30 ++----------------
.../include/renderers/HtmlSearchRenderer.class.php | 14 ++++++---
.../renderers/PeopleHtmlSearchRenderer.class.php | 16 ++++++----
.../renderers/ProjectHtmlSearchRenderer.class.php | 16 +++++-----
.../renderers/TasksHtmlSearchRenderer.class.php | 32 ++-----------------
.../renderers/TrackersHtmlSearchRenderer.class.php | 36 +++++-----------------
8 files changed, 47 insertions(+), 164 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
