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

setting default for optional 2. beforeSendToClient parameter to null

Browse Source
This commit is contained in:
Ralf Becker 2013-11-04 15:41:58 +00:00
parent 8cbe09b24c
commit 7180f78f00
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.etemplate_widget_customfields.inc.php
View File

@ -233,7 +233,7 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
{ {
$widget->attrs['only_app'] = $field['type']; $widget->attrs['only_app'] = $field['type'];
} }
$widget->beforeSendToClient($this->id == self::GLOBAL_ID ? '':$this->id, $fname); $widget->beforeSendToClient($this->id == self::GLOBAL_ID ? '':$this->id);
} }
} }
} }

10
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -106,7 +106,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
* @param string $cname * @param string $cname
* @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
*/ */
public function beforeSendToClient($cname, array $expand) public function beforeSendToClient($cname, array $expand=null)
{ {
$attrs = $this->attrs; $attrs = $this->attrs;
$form_name = self::form_name($cname, $this->id, $expand); $form_name = self::form_name($cname, $this->id, $expand);
@ -329,7 +329,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
// Tell the client about the changes // Tell the client about the changes
$request_value =& self::get_array(self::$request->content, $form_name,true); $request_value =& self::get_array(self::$request->content, $form_name,true);
$changes = $no_rows = false; $changes = $no_rows = false;
foreach($value_in as $key => $original_value) foreach($value_in as $key => $original_value)
{ {
// These keys are ignored // These keys are ignored
@ -622,7 +622,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
$egw_actions = array(); $egw_actions = array();
$n = 1; $n = 1;
$group = false; $group = false;
foreach((array)$actions as $id => $action) foreach((array)$actions as $id => $action)
{ {
// in case it's only selectbox id => label pairs // in case it's only selectbox id => label pairs
@ -632,7 +632,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
// Add 'Select All' after first group // Add 'Select All' after first group
if ($first_level && $group !== false && $action['group'] != $group && !$egw_actions[$prefix.'select_all']) if ($first_level && $group !== false && $action['group'] != $group && !$egw_actions[$prefix.'select_all'])
{ {
$egw_actions[$prefix.'select_all'] = array( $egw_actions[$prefix.'select_all'] = array(
'caption' => 'Select all', 'caption' => 'Select all',
//'checkbox' => true, //'checkbox' => true,
@ -702,7 +702,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
} }
$egw_actions[$prefix.$id] = $action; $egw_actions[$prefix.$id] = $action;
if (!$first_level && $n++ == $max_length) break; if (!$first_level && $n++ == $max_length) break;
} }
//echo "egw_actions="; _debug_array($egw_actions); //echo "egw_actions="; _debug_array($egw_actions);

2
etemplate/inc/class.etemplate_widget_textbox.inc.php
View File

@ -74,7 +74,7 @@ class etemplate_widget_textbox extends etemplate_widget
* @param string $cname * @param string $cname
* @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont' * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
*/ */
public function beforeSendToClient($cname, array $expand) public function beforeSendToClient($cname, array $expand=null)
{ {
// to NOT transmit passwords back to client, we need to store (non-empty) value in preserv // to NOT transmit passwords back to client, we need to store (non-empty) value in preserv
if ($this->attrs['type'] == 'passwd' || $this->type == 'passwd') if ($this->attrs['type'] == 'passwd' || $this->type == 'passwd')