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 e250de3f159da975304a905c3fe2aed6b2137d6a (commit)
from 54d273a3a79cfb26ebaa85d5f64d5d8cc0f3b900 (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=e250de3f159da975304a905c3fe2aed6b2137d6a
commit e250de3f159da975304a905c3fe2aed6b2137d6a
Author: Franck Villaume <[email protected]>
Date: Sun Dec 25 21:02:55 2016 +0100
Artifact Widget Display: initial support for preference edition in Content
Widget: title edition
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index d7869b7..6ae27f8 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -439,4 +439,33 @@ class Widget_TrackerContent extends Widget {
function canBeMinize() {
return false;
}
+
+ function hasPreferences() {
+ return true;
+ }
+
+ function getPreferences() {
+ return $this->getPartialPreferencesFormTitle($this->getTitle());
+ }
+
+ function updatePreferences(&$request) {
+ $done = false;
+ $vContentId = new Valid_UInt('content_id');
+ $vContentId->required();
+ if ($request->valid($vContentId)) {
+ $vTitle = new Valid_String('title');
+ if($request->valid($vTitle)) {
+ $title =
htmlspecialchars($request->get('title'));
+ } else {
+ $title = '';
+ }
+
+ if ($title) {
+ $sql = "UPDATE artifact_display_widget SET
title = $1 WHERE owner_id =$2 AND id = $3";
+ $res = db_query_params($sql,array($title,
$this->owner_id, (int)$request->get('content_id')));
+ $done = true;
+ }
+ }
+ return $done;
+ }
}
diff --git a/src/www/widgets/widget.php b/src/www/widgets/widget.php
index 5128667..0a1bf0b 100644
--- a/src/www/widgets/widget.php
+++ b/src/www/widgets/widget.php
@@ -59,6 +59,17 @@ if ($request->valid($vOwner)) {
$good = true;
}
break;
+ case WidgetLayoutManager::OWNER_TYPE_TRACKER:
+ if ($at = artifactType_get_object($owner_id)) {
+ $_REQUEST['group_id'] = $_GET['group_id'] =
$at->Group->getID();
+ $request->params['group_id'] =
$at->Group->getID(); //bad!
+ $redirect =
'/tracker/?group_id='.$at->Group->getID().'&atid='.$at->getID();
+ if (!forge_check_global_perm('forge_admin') &&
!forge_check_perm('tracker_admin', $at->getID())) {
+
$GLOBALS['Response']->redirect($redirect);
+ }
+ $good = true;
+ }
+ break;
default:
break;
}
@@ -79,7 +90,8 @@ if ($request->valid($vOwner)) {
if ($layout_id =
(int)$request->get('layout_id')) {
if ($owner_type
== WidgetLayoutManager::OWNER_TYPE_USER ||
forge_check_perm('project_admin', $group_id) ||
-
forge_check_global_perm('forge_admin')) {
+
forge_check_global_perm('forge_admin') ||
+
forge_check_perm('tracker_admin', $owner_id)) {
if
($request->get('cancel') || $widget->updatePreferences($request)) {
$lm->hideWidgetPreferences($owner_id, $owner_type, $layout_id, $name,
$instance_id);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget_TrackerContent.class.php | 29 +++++++++++++++++++++++
src/www/widgets/widget.php | 14 ++++++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
