extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +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

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

@ -420,7 +420,7 @@ class addressbook_ui extends addressbook_bo
)+array(
'icon' => 'foldertree_nolines_minus',
'disableClass' => 'rowNoEdit',
),
),
),
);
if (!$GLOBALS['egw_info']['user']['apps']['preferences']) unset($actions['cats']['children']['cat_edit']);
@ -2238,8 +2238,9 @@ window.egw_LAB.wait(function() {
// set id for automatic linking via quick add
$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']));
@ -2286,7 +2287,7 @@ window.egw_LAB.wait(function() {
{
if(!empty($_content))
{
$response = egw_json_response::get();
$query = egw_session::appsession('index','addressbook');
@ -2314,7 +2315,7 @@ window.egw_LAB.wait(function() {
if ($_content['button']['search']) $response->call("app.addressbook.adv_search");
if ($_content['button']['cancelsearch']) egw_framework::window_close (); //$response->addScript('this.close();');
}
//$GLOBALS['egw_info']['flags']['include_xajax'] = true;
//$GLOBALS['egw_info']['flags']['java_script'] .= "<script>window.egw_LAB.wait(function() {window.focus();});</script>";
$GLOBALS['egw_info']['etemplate']['advanced_search'] = true;
@ -2369,7 +2370,7 @@ window.egw_LAB.wait(function() {
$content['showsearchbuttons'] = true; // enable search operation and search buttons| they're disabled by default
if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
$this->tmpl->read('addressbook.edit');
$this->tmpl->set_cell_attribute('change_org','disabled',true);
return $this->tmpl->exec('addressbook.addressbook_ui.search',$content,$sel_options,$readonlys,array(),2);

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

@ -1952,7 +1952,7 @@ class infolog_ui
}
}
$preserv = $content;
// Don't preserve message
unset($preserv['msg']);
@ -2566,6 +2566,9 @@ class infolog_ui
*/
function hook_view($args)
{
// Load JS for infolog actions
egw_framework::validate_file('.','app','infolog');
switch ($args['location'])
{
case 'addressbook_view':