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 06beafb18e6310c6f493ab569f70c664ca3b386f (commit)
from 4a94454258317a42fb00061691d07b97a40ee33b (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=06beafb18e6310c6f493ab569f70c664ca3b386f
commit 06beafb18e6310c6f493ab569f70c664ca3b386f
Author: Franck Villaume <[email protected]>
Date: Tue Jul 12 20:30:15 2016 +0200
add missing column in tracker query
diff --git a/src/common/search/TrackersSearchQuery.class.php
b/src/common/search/TrackersSearchQuery.class.php
index 84bf1e3..3f2a6f3 100644
--- a/src/common/search/TrackersSearchQuery.class.php
+++ b/src/common/search/TrackersSearchQuery.class.php
@@ -67,7 +67,7 @@ class TrackersSearchQuery extends SearchQuery {
$words = $this->getFTIwords();
if (count($this->phrases)) {
- $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, users.realname,
artifact.summary||$1||artifact.details||$1||coalesce(ff_string_agg(artifact_message.body),
$1) as full_string_agg, artifact_idx.vectors FROM artifact LEFT OUTER JOIN
artifact_message USING (artifact_id), users, artifact_group_list, artifact_idx
WHERE users.user_id = artifact.submitted_by AND artifact.group_artifact_id =
artifact_group_list.group_artifact_id AND artifact_group_list.group_id = $2 ',
+ $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, users.realname,
artifact.summary||$1||artifact.details||$1||coalesce(ff_string_agg(artifact_message.body),
$1) as full_string_agg, artifact_idx.vectors, artifact_group_list.name FROM
artifact LEFT OUTER JOIN artifact_message USING (artifact_id), users,
artifact_group_list, artifact_idx WHERE users.user_id = artifact.submitted_by
AND artifact.group_artifact_id = artifact_group_list.group_artifact_id AND
artifact_group_list.group_id = $2 ',
array($this->field_separator, $this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
@@ -81,7 +81,7 @@ class TrackersSearchQuery extends SearchQuery {
$qpa = db_construct_qpa($qpa, ' ORDER BY
ts_rank(vectors, to_tsquery($1)) DESC',
array($words));
} else {
- $qpa = db_construct_qpa(false, 'SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, users.realname, artifact_idx.vectors FROM artifact, users,
artifact_group_list, artifact_idx WHERE users.user_id = artifact.submitted_by
AND artifact.group_artifact_id = artifact_group_list.group_artifact_id AND
artifact_group_list.group_id = $1 ',
+ $qpa = db_construct_qpa(false, 'SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, users.realname, artifact_idx.vectors,
artifact_group_list.name FROM artifact, users, artifact_group_list,
artifact_idx WHERE users.user_id = artifact.submitted_by AND
artifact.group_artifact_id = artifact_group_list.group_artifact_id AND
artifact_group_list.group_id = $1 ',
array($this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
@@ -117,9 +117,7 @@ class TrackersSearchQuery extends SearchQuery {
}
function isRowVisible($row) {
- return forge_check_perm('tracker',
-
$row['group_artifact_id'],
- 'read');
+ return forge_check_perm('tracker', $row['group_artifact_id'],
'read');
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/search/TrackersSearchQuery.class.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
