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

do not send/set extra data twice for multiple etemplate (eg. CRM view)

Browse Source
This commit is contained in:
Ralf Becker 2014-03-10 15:20:27 +00:00
parent 306e3488ba
commit f87e456be2
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ class etemplate_new extends etemplate_widget_template
{ {
//error_log("Ajax " . __LINE__); //error_log("Ajax " . __LINE__);
self::$response->generic('et2_load', $load_array+egw_framework::get_extra()); self::$response->generic('et2_load', $load_array+egw_framework::get_extra());
egw_framework::clear_extra(); // to not send/set it twice for multiple etemplates (eg. CRM view)
} }
else // first call else // first call
{ {

8
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -331,6 +331,14 @@ abstract class egw_framework
self::$extra[$app.'-'.$name] = $value; self::$extra[$app.'-'.$name] = $value;
} }
/**
* Clear all extra data
*/
public static function clear_extra()
{
self::$extra = array();
}
/** /**
* Allow eg. ajax to query content set via refresh_opener or window_close * Allow eg. ajax to query content set via refresh_opener or window_close
* *