[eGroupWare-svn] r46780 - in /trunk/projectmanager: inc/ js/

[<nat...@us...>]

Author: nathangray
Date: Tue Apr 29 21:58:01 2014
New Revision: 46780

URL: http://svn.stylite.de/viewvc/egroupware?rev=46780&view=rev
Log:
Replace & fix sidebox link to element list, add element list to tree context menu

Modified:
    trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php
    trunk/projectmanager/inc/class.projectmanager_hooks.inc.php
    trunk/projectmanager/inc/class.projectmanager_ui.inc.php
    trunk/projectmanager/js/app.js

Modified: trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php?rev=46780&r1=46779&r2=46780&view=diff
==============================================================================
--- trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php Tue Apr 29 21:58:01 2014
@@ -73,6 +73,7 @@
 			$this->tpl->location(array(
 				'menuaction' => 'projectmanager.projectmanager_ui.index',
 				'msg'        => lang('You need to select a project first'),
+				'ajax'       => 'true'
 			));
 		}
 		parent::__construct($pm_id);
@@ -83,6 +84,7 @@
 			$this->tpl->location(array(
 				'menuaction' => 'projectmanager.projectmanager_ui.index',
 				'msg'        => lang('Permission denied !!!'),
+				'ajax'       => 'true'
 			));
 		}
 
@@ -838,7 +840,7 @@
 		);
 		$this->tpl->read('projectmanager.elements.list');
 		$sel_options['project_tree'] = projectmanager_ui::ajax_tree(0, true);
-		$content['project_tree'] = 'projectmanager::'.$this->pm_id;
+		if($this->pm_id) $content['project_tree'] = 'projectmanager::'.$this->pm_id;
 		$this->tpl->setElementAttribute('project_tree','actions', projectmanager_ui::project_tree_actions());
 
 		// set id for automatic linking via quick add

Modified: trunk/projectmanager/inc/class.projectmanager_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/inc/class.projectmanager_hooks.inc.php?rev=46780&r1=46779&r2=46780&view=diff
==============================================================================
--- trunk/projectmanager/inc/class.projectmanager_hooks.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_hooks.inc.php Tue Apr 29 21:58:01 2014
@@ -121,7 +121,14 @@
 				'Projectlist' => egw::link('/index.php',array(
 					'menuaction' => 'projectmanager.projectmanager_ui.index',
 					'ajax' => 'true',
-				))
+				)),
+				array(
+					'text' => 'Elementlist',
+					'link' =>  egw::link('/index.php',array(
+							'menuaction' => 'projectmanager.projectmanager_elements_ui.index',
+							'ajax' => 'true',
+					)),
+				),
 			);
 			// show pricelist menuitem only if we use pricelists
 			if (!self::$config['accounting_types'] || in_array('pricelist',(is_array(self::$config['accounting_types'])?self::$config['accounting_types']:explode(',',self::$config['accounting_types']))))

Modified: trunk/projectmanager/inc/class.projectmanager_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/inc/class.projectmanager_ui.inc.php?rev=46780&r1=46779&r2=46780&view=diff
==============================================================================
--- trunk/projectmanager/inc/class.projectmanager_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_ui.inc.php Tue Apr 29 21:58:01 2014
@@ -1019,6 +1019,12 @@
 	{
 		$actions = array(
 			array(
+				'caption' => 'Elementlist',
+				'allowOnMultiple' => false,
+				'onExecute' => 'javaScript:app.projectmanager.set_project',
+				'default' => true,
+			),
+			array(
 				'caption' => 'Ganttchart',
 				'icon' => 'navbar',
 				'app'  => 'projectmanager',

Modified: trunk/projectmanager/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/js/app.js?rev=46780&r1=46779&r2=46780&view=diff
==============================================================================
--- trunk/projectmanager/js/app.js (original)
+++ trunk/projectmanager/js/app.js Tue Apr 29 21:58:01 2014
@@ -54,13 +54,25 @@
 	/**
 	 * Change the selected project
 	 *
-	 * @param {string|egwAction} 
+	 * This is a callback for the tree, either on click (node_id is a string) or
+	 * context menu
+	 *
+	 * TODO: This could be a little more efficient and just change the project ID of
+	 * whatever we're viewing
+	 *
+	 * Crazy parameters thanks to action system.
+	 * @param {string|egwAction} node_id Either the selected leaf, or a context-menu action
+	 * @param {et2_tree|egwActionObject[]} tree_widget Either the tree widget, or the selected leaf.
 	 */
 	set_project: function(node_id, tree_widget, old_node_id)
 	{
 		if(node_id == old_node_id)
 		{
 			return false;
+		}
+		if(typeof node_id == 'object' && tree_widget[0])
+		{
+			node_id = tree_widget[0].id;
 		}
 
 		if(node_id)