extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-01 12:23:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

explicitly loading addressbook css for CRM view and moved loading of infolog javascript to its hook

Browse Source
This commit is contained in:
Ralf Becker 2014-02-12 11:07:33 +00:00
parent 934650c64a
commit 7c02cd3cd4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -2238,8 +2238,9 @@ window.egw_LAB.wait(function() {
// set id for automatic linking via quick add // set id for automatic linking via quick add
$GLOBALS['egw_info']['flags']['currentid'] = $content['id']; $GLOBALS['egw_info']['flags']['currentid'] = $content['id'];
// Load JS for infolog actions
egw_framework::validate_file('.','app','infolog'); // load app.css for addressbook explicit, as addressbook_view hooks changes currentapp!
egw_framework::includeCSS('addressbook', 'app');
$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id'])); $this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id']));

3
infolog/inc/class.infolog_ui.inc.php
View File

@ -2566,6 +2566,9 @@ class infolog_ui
*/ */
function hook_view($args) function hook_view($args)
{ {
// Load JS for infolog actions
egw_framework::validate_file('.','app','infolog');
switch ($args['location']) switch ($args['location'])
{ {
case 'addressbook_view': case 'addressbook_view':