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 e004dd1e8421ccf86e905c025698b54454848765 (commit)
via bccf802165b223506f6a20e7f5bce252b0c8cdc4 (commit)
via 8f671130b9e67eacdc7b6a0fa2b00cdf42e7aeea (commit)
from 2030b4edb2af0258fefabb0b1a338788aee2b800 (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=e004dd1e8421ccf86e905c025698b54454848765
commit e004dd1e8421ccf86e905c025698b54454848765
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 18:35:24 2017 +0100
artifact display: fix remove relatedTask
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index e9acda4..456c822 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -435,7 +435,7 @@ class ArtifactTypeHtml extends ArtifactType {
}
}
- function renderRelatedTasks($group, $ah) {
+ function renderRelatedTasks($group, $ah, $formid = null) {
global $HTML;
if (!$group->usesPM()) {
return;
@@ -480,7 +480,7 @@ class ArtifactTypeHtml extends ArtifactType {
<td>'.$startdate.'</td>
<td>'.$enddate.'</td>
<td>'.$status.'
('.$taskinfo['percent_complete'].'%)</td>'.
- (($is_admin) ? '<td><input
type="checkbox" name="remlink[]" value="'.$taskid.'" /></td>' : '').
+ (($is_admin) ? '<td><input
type="checkbox" '.(($formid) ? 'form="'.$formid.'"' : '').' name="remlink[]"
value="'.$taskid.'" /></td>' : '').
'</tr>';
}
}
diff --git a/src/common/widget/Widget_TrackerComment.class.php
b/src/common/widget/Widget_TrackerComment.class.php
index 42ee999..db51547 100644
--- a/src/common/widget/Widget_TrackerComment.class.php
+++ b/src/common/widget/Widget_TrackerComment.class.php
@@ -128,7 +128,7 @@ class Widget_TrackerComment extends Widget {
$tabberContent .= html_e('div', array('id' =>
'tabber-comments', 'class' => 'tabbertab'), $divContent.$ah->showMessages());
if ($group->usesPM()) {
$tabberContent .= html_e('div', array('id' =>
'tabber-tasks', 'class' => 'tabbertab'),
-
$ath->renderRelatedTasks($group, $ah).
+
$ath->renderRelatedTasks($group, $ah, 'trackerform').
util_make_link('/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid,
html_image('ic/taskman20w.png', 20, 20).'<strong>'._('Build Task
Relation').'</strong>'));
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bccf802165b223506f6a20e7f5bce252b0c8cdc4
commit bccf802165b223506f6a20e7f5bce252b0c8cdc4
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 18:28:51 2017 +0100
fix display relatedTask in artifact
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index d521910..173755f 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -274,7 +274,7 @@ if ($group->usesPM()) {
?>
<div id="tabber-tasks" class="tabbertab">
<?php
- $ath->renderRelatedTasks($group, $ah);
+ echo $ath->renderRelatedTasks($group, $ah);
?>
</div>
<?php }
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index b99ff6b..e9acda4 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -451,7 +451,6 @@ class ArtifactTypeHtml extends ArtifactType {
} else {
$is_admin=false;
}
-
$totalPercentage = 0;
if ($taskcount > 0) {
$title_arr = array();
@@ -464,7 +463,7 @@ class ArtifactTypeHtml extends ArtifactType {
$return .= $HTML->listTableTop($title_arr);
for ($i = 0; $i < $taskcount; $i++) {
- $taskinfo = db_fetch_array($ah->relatedtasks,
$i);
+ $taskinfo =
db_fetch_array_by_row($ah->relatedtasks, $i);
$totalPercentage +=
$taskinfo['percent_complete'];
$taskid = $taskinfo['project_task_id'];
$projectid = $taskinfo['group_project_id'];
@@ -473,9 +472,9 @@ class ArtifactTypeHtml extends ArtifactType {
$summary =
util_unconvert_htmlspecialchars($taskinfo['summary']);
$startdate = date(_('Y-m-d H:i'),
$taskinfo['start_date']);
$enddate = date(_('Y-m-d H:i'),
$taskinfo['end_date']);
- $status = $taskinfo['status_name'];
- $return .= '<tr>
-
<td>'.util_make_link('/pm/task.php?func=detailtask&project_task_id='.$taskid.'&group_id='.$groupid.'&group_project_id='.$projectid,
'[T'.$taskid.'] '.$summary).'</td>
+ $status = $taskinfo['status_name'];
+ $return .= '<tr>
+
<td>'.util_make_link('/pm/t_follow.php/'.$taskid, '[T'.$taskid.']
'.$summary).'</td>
<td><div
class="percentbar" style="width: 100px;">
<div
style="width:'.round($taskinfo['percent_complete']).'px;"></div></div></td>
<td>'.$startdate.'</td>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8f671130b9e67eacdc7b6a0fa2b00cdf42e7aeea
commit 8f671130b9e67eacdc7b6a0fa2b00cdf42e7aeea
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 18:28:21 2017 +0100
artifact: display permalink
diff --git a/src/common/widget/Widget_TrackerGeneral.class.php
b/src/common/widget/Widget_TrackerGeneral.class.php
index 9011c79..7d3308e 100644
--- a/src/common/widget/Widget_TrackerGeneral.class.php
+++ b/src/common/widget/Widget_TrackerGeneral.class.php
@@ -101,6 +101,10 @@ class Widget_TrackerGeneral extends Widget {
$cells[][] = date(_('Y-m-d H:i'), $close_date);
$return .= $HTML->multiTableRow(array('class'
=> $HTML->boxGetAltRowStyle($i++, true)), $cells);
}
+ $cells = array();
+ $cells[][] = html_e('strong', array(),
util_make_link($ah->getPermalink(), _('Permalink'))._(':'));
+ $cells[][] = util_make_url($ah->getPermalink());
+ $return .= $HTML->multiTableRow(array('class' =>
$HTML->boxGetAltRowStyle($i++, true)), $cells);
$return .= $HTML->listTableBottom();
}
return $return;
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/mod.php | 2 +-
src/common/tracker/include/ArtifactTypeHtml.class.php | 13 ++++++-------
src/common/widget/Widget_TrackerComment.class.php | 2 +-
src/common/widget/Widget_TrackerGeneral.class.php | 4 ++++
4 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
