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 c3d5df0c06705e9effd8b225d00f667d7dc14e0c (commit)
via 89270e7b781ba9b180f69232734c3fd50734bfa5 (commit)
via d5b983c6edb978d2b5b9e897d1a00be3657dcbd6 (commit)
from 06bcbe5fe389799ee84ce85a76586eff6550f9e9 (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=c3d5df0c06705e9effd8b225d00f667d7dc14e0c
commit c3d5df0c06705e9effd8b225d00f667d7dc14e0c
Merge: 89270e7 d5b983c
Author: Franck Villaume <[email protected]>
Date: Wed Aug 18 12:46:11 2021 +0200
Merge remote-tracking branch 'rhabacker/master-931'
Implement [#931]: status of frs, tasks & artifacts in global search
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=89270e7b781ba9b180f69232734c3fd50734bfa5
commit 89270e7b781ba9b180f69232734c3fd50734bfa5
Author: Franck Villaume <[email protected]>
Date: Wed Aug 18 12:45:52 2021 +0200
clean-up: remove dup vars
diff --git a/src/plugins/hudson/include/hudsonViews.class.php
b/src/plugins/hudson/include/hudsonViews.class.php
index 2ae2373..07155a3 100644
--- a/src/plugins/hudson/include/hudsonViews.class.php
+++ b/src/plugins/hudson/include/hudsonViews.class.php
@@ -258,8 +258,6 @@ class hudsonViews extends Views {
function _display_jobs_table($group_id) {
global $HTML;
- $request =& HTTPRequest::instance();
- $group_id = $request->get('group_id');
$user = session_get_user();
$job_dao = new
PluginHudsonJobDao(CodendiDataAccess::instance());
$dar = $job_dao->searchByGroupID($group_id);
@@ -281,7 +279,7 @@ class hudsonViews extends Views {
if ($project->usesService('cvs')) {
echo ' <th class="boxtitle">'._("CVS
trigger").'</th>';
}
- if ($user->isMember($request->get('group_id'), 'A')) {
+ if ($user->isMember($group_id, 'A')) {
echo ' <th
class="boxtitle">'._("Actions").'</th>';
}
echo ' </tr>';
@@ -337,7 +335,7 @@ class hudsonViews extends Views {
echo ' <td
colspan="'.$nb_columns.'">'.$HTML->error_msg($e->getMessage()).'</td>';
}
- if ($user->isMember($request->get('group_id'),
'A')) {
+ if ($user->isMember($group_id, 'A')) {
echo ' <td>';
// edit job
echo ' <span class="job_action">';
@@ -363,7 +361,7 @@ class hudsonViews extends Views {
} else {
echo '<p>'._('No Hudson jobs associated with this
project.');
echo "\n";
- if ($user->isMember($request->get('group_id'), 'A')) {
+ if ($user->isMember($group_id, 'A')) {
echo _('To add a job, select the link just
below.');
}
echo '</p>';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d5b983c6edb978d2b5b9e897d1a00be3657dcbd6
commit d5b983c6edb978d2b5b9e897d1a00be3657dcbd6
Author: Ralf Habacker <[email protected]>
Date: Tue Aug 17 11:28:03 2021 +0200
[#931] Add status column to results in global artifact, frs and tracker
search
diff --git a/src/common/search/ArtifactSearchQuery.class.php
b/src/common/search/ArtifactSearchQuery.class.php
index 42ee8ac..544479c 100644
--- a/src/common/search/ArtifactSearchQuery.class.php
+++ b/src/common/search/ArtifactSearchQuery.class.php
@@ -65,13 +65,13 @@ class ArtifactSearchQuery 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_idx WHERE
artifact.is_deleted = 0 AND users.user_id = artifact.submitted_by AND
artifact.group_artifact_id = $2 AND artifact.artifact_id =
artifact_idx.artifact_id AND vectors @@ to_tsquery($3) GROUP BY
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, users.realname, artifact.details, vectors) AS x WHERE ',
+ $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, status_name, 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) LEFT OUTER JOIN artifact_status ast ON
artifact.status_id=ast.id, users, artifact_idx WHERE artifact.is_deleted = 0
AND users.user_id = artifact.submitted_by AND artifact.group_artifact_id = $2
AND artifact.artifact_id = artifact_idx.artifact_id AND vectors @@
to_tsquery($3) GROUP BY artifact.artifact_id, artifact.group_artifact_id,
artifact.summary, artifact.open_date, users.realname, artifact.details,
vectors) AS x WHERE ',
array
($this->field_separator, $this->artifactId, $words));
$qpa = $this->addMatchCondition($qpa,
'full_string_agg');
$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_idx WHERE artifact.is_deleted = 0 AND users.user_id =
artifact.submitted_by AND artifact.group_artifact_id = $1 AND
artifact.artifact_id = artifact_idx.artifact_id AND vectors @@ to_tsquery($2)
ORDER BY ts_rank(vectors, to_tsquery($2)) DESC',
+ $qpa = db_construct_qpa(false, 'SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, status_name, users.realname, artifact_idx.vectors FROM
artifact LEFT OUTER JOIN artifact_status ast ON artifact.status_id=ast.id,
users, artifact_idx WHERE artifact.is_deleted = 0 AND users.user_id =
artifact.submitted_by AND artifact.group_artifact_id = $1 AND
artifact.artifact_id = artifact_idx.artifact_id AND vectors @@ to_tsquery($2)
ORDER BY ts_rank(vectors, to_tsquery($2)) DESC',
array
($this->artifactId, $words));
}
diff --git a/src/common/search/FrsSearchQuery.class.php
b/src/common/search/FrsSearchQuery.class.php
index c3198f3..aa1c011 100644
--- a/src/common/search/FrsSearchQuery.class.php
+++ b/src/common/search/FrsSearchQuery.class.php
@@ -64,7 +64,7 @@ class FrsSearchQuery extends SearchQuery {
* @return array query+params array
*/
function getQuery() {
- $qpa = db_construct_qpa(false, 'SELECT
ts_headline(frs_package.name, q) AS package_name, ts_headline(frs_release.name,
q) as release_name, frs_release.release_date, frs_release.release_id,
users.realname, frs_release.package_id FROM frs_file, frs_release, users,
frs_package, to_tsquery($1) AS q, frs_release_idx r, frs_file_idx f WHERE
frs_release.released_by = users.user_id AND r.release_id =
frs_release.release_id AND f.file_id = frs_file.file_id AND
frs_package.package_id = frs_release.package_id AND
frs_file.release_id=frs_release.release_id AND frs_package.group_id=$2 ',
+ $qpa = db_construct_qpa(false, 'SELECT
ts_headline(frs_package.name, q) AS package_name, ts_headline(frs_release.name,
q) as release_name, frs_release.release_date, frs_release.release_id,
frs_status.name as status_name, users.realname, frs_release.package_id FROM
frs_file, frs_release LEFT OUTER JOIN frs_status USING(status_id), users,
frs_package, to_tsquery($1) AS q, frs_release_idx r, frs_file_idx f WHERE
frs_release.released_by = users.user_id AND r.release_id =
frs_release.release_id AND f.file_id = frs_file.file_id AND
frs_package.package_id = frs_release.package_id AND
frs_file.release_id=frs_release.release_id AND frs_package.group_id=$2 ',
array($this->getFTIwords(),
$this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
$qpa = db_construct_qpa($qpa, 'AND
frs_package.package_id = ANY ($1) ',
diff --git a/src/common/search/TasksSearchQuery.class.php
b/src/common/search/TasksSearchQuery.class.php
index 78790c1..5f860d8 100644
--- a/src/common/search/TasksSearchQuery.class.php
+++ b/src/common/search/TasksSearchQuery.class.php
@@ -67,7 +67,7 @@ class TasksSearchQuery extends SearchQuery {
$words = $this->getFTIwords();
if (count($this->phrases)) {
- $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
project_task.project_task_id, project_task.group_project_id,
project_task.summary, project_task.percent_complete, project_task.start_date,
project_task.end_date, users.realname, project_group_list.project_name,
project_task.summary||$1||project_task.details||$1||coalesce(ff_string_agg(project_messages.body),
$1) as full_string_agg, project_task_idx.vectors FROM project_task LEFT OUTER
JOIN project_messages USING (project_task_id), users, project_group_list,
project_task_idx WHERE users.user_id = project_task.created_by AND
project_task.group_project_id = project_group_list.group_project_id AND
project_group_list.group_id = $2 ',
+ $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
project_task.project_task_id, project_task.group_project_id,
project_task.summary, project_task.percent_complete, project_task.start_date,
project_task.end_date, status_name, users.realname,
project_group_list.project_name,
project_task.summary||$1||project_task.details||$1||coalesce(ff_string_agg(project_messages.body),
$1) as full_string_agg, project_task_idx.vectors FROM project_task LEFT OUTER
JOIN project_messages USING (project_task_id) LEFT OUTER JOIN project_status
USING(status_id), users, project_group_list, project_task_idx WHERE
users.user_id = project_task.created_by AND project_task.group_project_id =
project_group_list.group_project_id AND project_group_list.group_id = $2 ',
array($this->field_separator, $this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
@@ -81,7 +81,7 @@ class TasksSearchQuery 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
project_task.project_task_id, project_task.group_project_id,
project_task.summary, project_task.percent_complete, project_task.start_date,
project_task.end_date, users.realname, project_group_list.project_name,
project_task_idx.vectors FROM project_task, users, project_group_list,
project_task_idx WHERE users.user_id = project_task.created_by AND
project_task.group_project_id = project_group_list.group_project_id AND
project_group_list.group_id = $1 ',
+ $qpa = db_construct_qpa(false, 'SELECT
project_task.project_task_id, project_task.group_project_id,
project_task.summary, project_task.percent_complete, project_task.start_date,
project_task.end_date, status_name, users.realname,
project_group_list.project_name, project_task_idx.vectors FROM project_task
LEFT OUTER JOIN project_status USING(status_id), users, project_group_list,
project_task_idx WHERE users.user_id = project_task.created_by AND
project_task.group_project_id = project_group_list.group_project_id AND
project_group_list.group_id = $1 ',
array($this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
diff --git a/src/common/search/TrackersSearchQuery.class.php
b/src/common/search/TrackersSearchQuery.class.php
index ac73c01..5dba32e 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, 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 ',
+ $qpa = db_construct_qpa(false, 'SELECT x.* FROM (SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, status_name, users.realname, status_name,
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) LEFT OUTER JOIN
artifact_status ON artifact.status_id=artifact_status.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,
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 ',
+ $qpa = db_construct_qpa(false, 'SELECT
artifact.artifact_id, artifact.group_artifact_id, artifact.summary,
artifact.open_date, status_name, users.realname, artifact_idx.vectors,
artifact_group_list.name, artifact_status.status_name FROM artifact LEFT OUTER
JOIN artifact_status ON artifact.status_id=artifact_status.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 = $1 ',
array($this->groupId));
if ($this->sections != SEARCH__ALL_SECTIONS) {
diff --git
a/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
index 4a6183d..e06b569 100644
--- a/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
@@ -54,7 +54,8 @@ class ArtifactHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
_('Id'),
_('Summary'),
_('Submitted by'),
- _('Open Date')
+ _('Open Date'),
+ _('Status')
);
}
@@ -77,7 +78,8 @@ class ArtifactHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
. html_image('ic/tracker20g.png')
. ' '.$row['summary'].'</a></td>'
. '<td>'.$row['realname']."</td>"
- .
'<td>'.relative_date($row['open_date']).'</td></tr>';
+ .
'<td>'.relative_date($row['open_date']).'</td>'
+ . '<td>'._($row['status_name']).'</td></tr>';
$i++;
}
return $return;
diff --git a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
index 47805ef..faab695 100644
--- a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
@@ -45,6 +45,7 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
_('Release Name'),
_('Submitted by'),
_('Post Date'),
+ _('Status'),
);
}
@@ -73,7 +74,9 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
. '<td style="width: 5%"> </td>'
. '<td>'.util_make_link
('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.$row['release_id'],$row['release_name']).'</td>'
. '<td style="width:
15%">'.$row['realname'].'</td>'
- . '<td style="width:
15%">'.relative_date($row['release_date']).'</td></tr>';
+ . '<td style="width:
15%">'.relative_date($row['release_date']).'</td>'
+ . '<td style="width:
15%">'._($row['status_name']).'</td>'
+ . ' </tr>';
$rowColor ++;
}
return $return;
diff --git a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
index 0f14308..aaaf1b4 100644
--- a/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TasksHtmlSearchRenderer.class.php
@@ -47,7 +47,8 @@ class TasksHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
_('Start Date'),
_('End Date'),
_('Created by'),
- _('Completed')
+ _('Completed'),
+ _('Status'),
);
}
@@ -81,7 +82,9 @@ class TasksHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
. ' <td style="width:
15%">'.relative_date($row['start_date']).'</td>'
. ' <td style="width:
15%">'.relative_date($row['end_date']).'</td>'
. ' <td style="width:
15%">'.$row['realname'].'</td>'
- . ' <td style="width:
8%">'.$row['percent_complete'].' %</td></tr>';
+ . ' <td style="width:
8%">'.$row['percent_complete'].' %</td>'
+ . ' <td style="width:
15%">'._($row['status_name']).'</td>'
+ . ' </tr>';
$rowColor ++;
}
return $return;
diff --git
a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
index 2f79d42..e42f236 100644
--- a/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/TrackersHtmlSearchRenderer.class.php
@@ -46,7 +46,8 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
_('#'),
_('Summary'),
_('Submitted by'),
- _('Date')
+ _('Date'),
+ _('Status'),
);
}
@@ -77,7 +78,9 @@ class TrackersHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
.'<td>'.util_make_link('/tracker/a_follow.php/'.$row['artifact_id'],
$HTML->getFollowPic().' '.$row['summary'])
.'</td>'
.'<td style="width:
15%">'.$row['realname'].'</td>'
- .'<td style="width:
15%">'.relative_date($row['open_date']).'</td></tr>';
+ .'<td style="width:
15%">'.relative_date($row['open_date']).'</td>'
+ .'<td style="width:
15%">'._($row['status_name']).'</td>'
+ .'</tr>';
$rowColor++;
}
return $return;
-----------------------------------------------------------------------
Summary of changes:
src/common/search/ArtifactSearchQuery.class.php | 4 ++--
src/common/search/FrsSearchQuery.class.php | 2 +-
src/common/search/TasksSearchQuery.class.php | 4 ++--
src/common/search/TrackersSearchQuery.class.php | 4 ++--
src/plugins/hudson/include/hudsonViews.class.php | 8 +++-----
.../search/include/renderers/ArtifactHtmlSearchRenderer.class.php | 6 ++++--
src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php | 5 ++++-
.../search/include/renderers/TasksHtmlSearchRenderer.class.php | 7 +++++--
.../search/include/renderers/TrackersHtmlSearchRenderer.class.php | 7 +++++--
9 files changed, 28 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
