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 c414662e488115033840ab8bfff1140b20c4f0b5 (commit)
via 21d350e337cdae8f8cf968ee4f552059015c065d (commit)
from 2016446c07df5c5fc532f7029c59350c09b19f5b (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=c414662e488115033840ab8bfff1140b20c4f0b5
commit c414662e488115033840ab8bfff1140b20c4f0b5
Author: Franck Villaume <[email protected]>
Date: Mon Dec 26 18:38:11 2016 +0100
widget tracker content: set information message when no custom field
available
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index ceb0316..c948faa 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -112,8 +112,8 @@ class Widget_TrackerContent extends Widget {
$artifactTypeObject = artifactType_get_object($atid);
$availableExtraFields = $artifactTypeObject->getExtraFields();
$stillAvailableExtraFields =
$this->availableExtrafields($owner_id, $availableExtraFields);
- $content = html_e('p', array(), sprintf(_('Tick available
ExtraFields from %s to display into this widget'),
$artifactTypeObject->getName())._(':'));
if (count($stillAvailableExtraFields) > 0) {
+ $content = html_e('p', array(), sprintf(_('Tick
available custom fields from %s to display into this widget'),
$artifactTypeObject->getName())._(':'));
$content .= $HTML->listTableTop(array('', '', _('Column
ID'), _('Row ID')));
foreach ($stillAvailableExtraFields as $key =>
$stillAvailableExtraField) {
$cells = array();
@@ -124,6 +124,8 @@ class Widget_TrackerContent extends Widget {
$content .= $HTML->multiTableRow(array('class'
=> $HTML->boxGetAltRowStyle($key, true)), $cells);
}
$content .= $HTML->listTableBottom();
+ } else {
+ $content = $HTML->information(_('No custom fields
available to link to this widget'));
}
return $content;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=21d350e337cdae8f8cf968ee4f552059015c065d
commit 21d350e337cdae8f8cf968ee4f552059015c065d
Author: Franck Villaume <[email protected]>
Date: Mon Dec 26 18:25:24 2016 +0100
fix tab selected in some case when browsing tracker. group_id has to be
global
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 28d4d67..153a587 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -40,12 +40,13 @@ class ArtifactTypeHtml extends ArtifactType {
if (!forge_get_config('use_tracker')) {
exit_disabled();
}
- $group_id= $this->Group->getID();
+ global $group_id;
+ $group_id = $this->Group->getID();
//required by new site_project_header
- $params['group']=$group_id;
- $params['toptab']='tracker';
- $params['tabtext']=$this->getName();
+ $params['group'] = $group_id;
+ $params['toptab'] = 'tracker';
+ $params['tabtext'] = $this->getName();
$labels = array();
$links = array();
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/include/ArtifactTypeHtml.class.php | 9 +++++----
src/common/widget/Widget_TrackerContent.class.php | 4 +++-
2 files changed, 8 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
