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 4662f6ca241bcd325b62517e9d05a64f5ae211be (commit)
via 9eecc878886e7f1425816821b5d4a2f394686470 (commit)
from 1880fdf639adb46ed7c814cb90cba49d26b8147b (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=4662f6ca241bcd325b62517e9d05a64f5ae211be
commit 4662f6ca241bcd325b62517e9d05a64f5ae211be
Merge: 1880fdf 9eecc87
Author: Franck Villaume <[email protected]>
Date: Mon Aug 16 15:20:15 2021 +0200
Merge remote-tracking branch 'rhabacker/master-958'
Implement #958: display release statut in frs release list
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9eecc878886e7f1425816821b5d4a2f394686470
commit 9eecc878886e7f1425816821b5d4a2f394686470
Author: Ralf Habacker <[email protected]>
Date: Tue Aug 3 11:26:29 2021 +0200
[#958] Show release status in frs release list
diff --git a/src/common/frs/FRSRelease.class.php
b/src/common/frs/FRSRelease.class.php
index 684b934..dea3fde 100644
--- a/src/common/frs/FRSRelease.class.php
+++ b/src/common/frs/FRSRelease.class.php
@@ -268,6 +268,21 @@ class FRSRelease extends FFObject {
}
/**
+ * getStatusName - get the status name of this release based on his
status_id.
+ *
+ * @return string The status name.
+ */
+ function getStatusName() {
+ $res = db_query_params('SELECT * FROM frs_status', array());
+ while ($arr = db_fetch_array($res)) {
+ if ($arr['status_id'] == $this->getStatus()) {
+ return $arr['name'];
+ }
+ }
+ return NULL;
+ }
+
+ /**
* getNotes - get the release notes of this release.
*
* @return string The release notes.
diff --git a/src/common/frs/views/showreleases.php
b/src/common/frs/views/showreleases.php
index 453c672..189abaa 100644
--- a/src/common/frs/views/showreleases.php
+++ b/src/common/frs/views/showreleases.php
@@ -70,7 +70,7 @@ if (empty($rs)) {
// Display a list of releases in this package
echo html_e('h2', array(), _('Available Releases for the package').'
'.$frsp->getName());
- $title_arr = array(html_e('input', array('id' => 'checkallactive',
'type' => 'checkbox', 'title' => _('Select / Deselect all releases for
massaction'), 'onClick' => 'controllerFRS.checkAll("checkedrelidactive",
"active")')), _('Release Name'), _('Date'), _('Actions'));
+ $title_arr = array(html_e('input', array('id' => 'checkallactive',
'type' => 'checkbox', 'title' => _('Select / Deselect all releases for
massaction'), 'onClick' => 'controllerFRS.checkAll("checkedrelidactive",
"active")')), _('Release Name'), _('Date'), _('State'), _('Actions'));
echo $HTML->listTableTop($title_arr);
for ($i = 0; $i < count($rs); $i++) {
@@ -82,6 +82,7 @@ if (empty($rs)) {
$cells[][] = html_e('input', $releaseInputAttr);
$cells[][] = $rs[$i]->getName();
$cells[][] = date('Y-m-d H:i',$rs[$i]->getReleaseDate());
+ $cells[][] = _($rs[$i]->getStatusName());
$content =
util_make_link('/frs/?view=editrelease&group_id='.$group_id.'&package_id='.$package_id.'&release_id='.$rs[$i]->getID(),
$HTML->getConfigurePic(_('Edit'), _('Edit')));
if (forge_check_perm('frs', $package_id, 'release')) {
$deleteUrlAction =
util_make_uri('/frs/?action=deleterelease&package_id='.$package_id.'&group_id='.$group_id.'&release_id='.$rs[$i]->getID());
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/FRSRelease.class.php | 15 +++++++++++++++
src/common/frs/views/showreleases.php | 3 ++-
2 files changed, 17 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
