holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- automatic creation of action_links (enabled actions and ones which need to be checked if enabled) by using all first level actions plus the ones with enabled set to 'javaScript:...'

Browse Source 
- a bit of docu about the actions system usable through nextmatch widget
--> addressbook disables now "remove from distirbution list" and "delete selected distribution list", if no distribution list is selected
This commit is contained in:
Ralf Becker 2011-04-26 19:50:03 +00:00
parent 7869bd59b0
commit dc88e0c190
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.etemplate.inc.php
View File

@ -972,6 +972,8 @@ class etemplate extends boetemplate
// prefix given here
$prefix = "egw_";
$action_links = array();
$html .= '
<script type="text/javascript">
$(document).ready(function() {
@ -980,11 +982,11 @@ class etemplate extends boetemplate
'.$prefix.'objectManager = new egwActionObjectManager("", '.$prefix.'actionManager);
'.$prefix.'actionManager.updateActions('.str_replace('},',"},\n",
json_encode(nextmatch_widget::egw_actions($content['_actions'], $this->name))).');
json_encode(nextmatch_widget::egw_actions($content['_actions'], $this->name, '', $action_links))).');
'.$prefix.'actionManager.setDefaultExecute("javaScript:nm_action");
var actionLinks = ['.($content['_actions'] ? '"'.implode('","', isset($content['_actions_enabled']) ?
$content['_actions_enabled'] : array_keys($content['_actions'])).'"' : '').'];
var actionLinks = ['.($content['_actions'] ? '"'.implode('","', isset($content['_action_links']) ?
$content['_action_links'] : $action_links).'"' : '').'];
// Create a new action object for each table row
// TODO: only apply function to outer level

18
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -56,6 +56,10 @@
* 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames or preferred importexport definition,
* array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
* or name of import/export definition
* 'row_id' => // I key into row content to set it's value as tr id, eg. 'id'
* 'actions' => // I array with actions, see nextmatch_widget::egw_actions
* 'action_links' => // I array with enabled actions or ones which should be checked if they are enabled
* optional, default id of all first level actions plus the ones with enabled='javaScript:...'
* );
*/
class nextmatch_widget
@ -503,6 +507,7 @@ class nextmatch_widget
// pass actions and row_id to etemplate::show_grid()
$value['rows']['_actions'] =& $value['actions'];
$value['rows']['_action_links'] =& $value['action_links'];
$value['rows']['_row_id'] =& $value['row_id'];
$value['action'] = $value['selected'] = $value['select_all'] = null; // nothing yet
@ -557,9 +562,10 @@ class nextmatch_widget
* @param array $actions id indexed array of actions / array with valus for keys: 'iconUrl', 'caption', 'onExecute', ...
* @param string $template_name='' name of the template, used as default for app name of images
* @param string $prefix='' prefix for ids
* @param array &$action_links=array() on return all first-level actions plus the ones with enabled='javaScript:...'
* @return array
*/
public static function egw_actions(array $actions=null, $template_name='', $prefix='')
public static function egw_actions(array $actions=null, $template_name='', $prefix='', array &$action_links=array())
{
// default icons for some common actions
static $default_icons = array(
@ -572,6 +578,8 @@ class nextmatch_widget
'document' => 'etemplate/merge',
);
$first_level = !$action_links; // add all first level actions
//echo "actions="; _debug_array($actions);
$egw_actions = array();
foreach((array)$actions as $id => $action)
@ -580,6 +588,12 @@ class nextmatch_widget
if (!is_array($action)) $action = array('caption' => $action);
$action['id'] = $prefix.$id;
// add all first level actions plus ones with enabled = 'javaScript:...' to action_links
if ($first_level || substr($action['enabled'],0,11) == 'javaScript:')
{
$action_links[] = $action['id'];
}
// set default icon, if no other is specified
if (!isset($action['icon']) && isset($default_icons[$id]))
{
@ -632,7 +646,7 @@ class nextmatch_widget
// add sub-menues
if ($action['children'])
{
$action['children'] = self::egw_actions($action['children'], $template_name, $action['prefix']);
$action['children'] = self::egw_actions($action['children'], $template_name, $action['prefix'], $action_links);
unset($action['prefix']);
}