[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42663] trunk

[<lph...@us...>]

Revision: 42663
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42663&view=rev
Author:   lphuberdeau
Date:     2012-08-22 10:47:33 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
[MOD] Allow editing of items from different trackers than the default one

Modified Paths:
--------------
    trunk/lib/core/Services/Tracker/CalendarController.php
    trunk/templates/wiki-plugins/trackercalendar.tpl

Modified: trunk/lib/core/Services/Tracker/CalendarController.php
===================================================================
--- trunk/lib/core/Services/Tracker/CalendarController.php	2012-08-22 10:20:28 UTC (rev 42662)
+++ trunk/lib/core/Services/Tracker/CalendarController.php	2012-08-22 10:47:33 UTC (rev 42663)
@@ -49,6 +49,7 @@
 			$item = Tracker_Item::fromId($row['object_id']);
 			$response[] = array(
 				'id' => $row['object_id'],
+				'trackerId' => isset($row['tracker_id']) ? $row['tracker_id'] : null,
 				'title' => $row['title'],
 				'description' => '',
 				'url' => smarty_modifier_sefurl($row['object_id'], $row['object_type']),

Modified: trunk/templates/wiki-plugins/trackercalendar.tpl
===================================================================
--- trunk/templates/wiki-plugins/trackercalendar.tpl	2012-08-22 10:20:28 UTC (rev 42662)
+++ trunk/templates/wiki-plugins/trackercalendar.tpl	2012-08-22 10:47:33 UTC (rev 42663)
@@ -54,9 +54,9 @@
 				element.cluetip({arrows: true, splitTitle: '|', clickThrough: true});
 			},
 			eventClick: function(event) {
-				if (event.editable) {
+				if (event.editable && event.trackerId) {
 					var info = {
-						trackerId: data.trackerId,
+						trackerId: event.trackerId,
 						itemId: event.id
 					};
 					$('<a href="#"/>').attr('href', $.service('tracker', 'update_item', info)).serviceDialog({

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.