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, 6.1 has been updated
via 93aa75d696d754252df24ef6c9078917c88244da (commit)
via c55906d2651434346c460a412f747f8625f612a0 (commit)
via 67c5085d6b93d1aa1fcec074dbe23ee5ac733ae9 (commit)
from c0fda19c65abcdca4bb40dd6265b9ff257659657 (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=93aa75d696d754252df24ef6c9078917c88244da
commit 93aa75d696d754252df24ef6c9078917c88244da
Author: Franck Villaume <[email protected]>
Date: Mon Jan 22 20:25:43 2018 +0100
tracker: fix attachment deletion in widget view
diff --git a/src/common/tracker/actions/tracker.php
b/src/common/tracker/actions/tracker.php
index 226bc5d..ccc2b78 100644
--- a/src/common/tracker/actions/tracker.php
+++ b/src/common/tracker/actions/tracker.php
@@ -395,7 +395,7 @@ switch (getStringFromRequest('func')) {
//
// Delete list of files from this
artifact
//
- $delete_file =
getStringFromRequest('delete_file');
+ $delete_file =
getArrayFromRequest('delete_file', null);
if ($delete_file) {
$count=count($delete_file);
for ($i=0; $i<$count; $i++) {
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index e00d401..c94ce5b 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -510,7 +510,7 @@ class ArtifactTypeHtml extends ArtifactType {
return $return;
}
- function renderFiles($group_id, $ah) {
+ function renderFiles($group_id, $ah, $formid = null) {
global $HTML;
$file_list =& $ah->getFiles();
$count=count($file_list);
@@ -537,7 +537,7 @@ class ArtifactTypeHtml extends ArtifactType {
$return .=
'<td>'.util_display_user($file->getSubmittedUnixName(),
$file->getSubmittedBy(), $file->getSubmittedRealName()).'</td>';
$return .=
'<td>'.util_make_link('/tracker/download.php/'.$group_id.'/'.
$this->getID().'/'. $ah->getID() .'/'.$file->getID().'/'.$file->getName(),
htmlspecialchars($file->getName())).'</td>';
if (forge_check_perm('tracker', $this->getID(),
'tech')) {
- $return .= '<td><input type="checkbox"
name="delete_file[]" value="'. $file->getID() .'">'._('Delete').'</td>';
+ $return .= '<td><input type="checkbox"
name="delete_file[]" '.(($formid) ? 'form="'.$formid.'"' : '').' value="'.
$file->getID() .'">'._('Delete').'</td>';
}
$return .= '</tr>';
}
diff --git a/src/common/widget/Widget_TrackerComment.class.php
b/src/common/widget/Widget_TrackerComment.class.php
index 3e93da5..bd59fad 100644
--- a/src/common/widget/Widget_TrackerComment.class.php
+++ b/src/common/widget/Widget_TrackerComment.class.php
@@ -153,7 +153,7 @@ class Widget_TrackerComment extends Widget {
}
}
if ($func == 'detail') {
- $attachmentContent .= $ath->renderFiles($group_id, $ah);
+ $attachmentContent .= $ath->renderFiles($group_id, $ah,
'trackerform');
}
$tabberContent .= html_e('div', array('id' =>
'tabber-attachments', 'class' => 'tabbertab'),
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c55906d2651434346c460a412f747f8625f612a0
commit c55906d2651434346c460a412f747f8625f612a0
Author: Franck Villaume <[email protected]>
Date: Mon Jan 22 20:24:59 2018 +0100
use a_follow.php when possible
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 62675c6..10f8949 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -314,7 +314,7 @@ function hide_edit_button(id) {
$title = $parentG->getPublicName()._(':
').$parentAt->getName();
$return .= '<strong>'.$title.'</strong>';
$text = '[#'.$parent->getID().']';
- $url =
'/tracker/?func=detail&aid='.$parent->getID().'&group_id='.$parentG->getID().'&atid='.$parentAt->getID();
+ $url =
'/tracker/a_follow.php/'.$parent->getID();
$arg['title'] =
util_html_secure($parent->getSummary());
if ($parent->getStatusID() == 2) {
$arg['class'] = 'artifact_closed';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=67c5085d6b93d1aa1fcec074dbe23ee5ac733ae9
commit 67c5085d6b93d1aa1fcec074dbe23ee5ac733ae9
Author: Franck Villaume <[email protected]>
Date: Mon Jan 22 20:20:57 2018 +0100
use a_follow.php when possible
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 9ffcf74..62675c6 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -273,7 +273,7 @@ function hide_edit_button(id) {
$end = '<br /><br />';
}
$text = '[#'.$arr['artifact_id'].']';
- $url =
'/tracker/?func=detail&aid='.$arr['artifact_id'].'&group_id='.$arr['group_id'].'&atid='.$arr['group_artifact_id'];
+ $url =
'/tracker/a_follow.php/'.$arr['artifact_id'];
$arg['title'] =
util_html_secure($arr['summary']);
if ($arr['status_id'] == 2) {
$arg['class'] =
'artifact_closed';
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/tracker.php | 2 +-
src/common/tracker/include/ArtifactHtml.class.php | 4 ++--
src/common/tracker/include/ArtifactTypeHtml.class.php | 4 ++--
src/common/widget/Widget_TrackerComment.class.php | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
