extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 14:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP multitab:

Browse Source 
- fix duplicated sidebox view id
This commit is contained in:
Hadi Nategh 2020-10-21 14:58:19 +02:00
parent d4d63d382e
commit 6a5c6599dd
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class addressbook_hooks
{ {
display_sidebox($appname, lang('Contact data'), array( display_sidebox($appname, lang('Contact data'), array(
array( array(
'text' => '<div id="addressbook_'.$_GET['contact_id'].'_view_sidebox" class="addressbook_view_sidebox"/>', 'text' => '<div id="'.self::getViewDOMID($_GET['contact_id'], $_GET['crm_list']).'" class="addressbook_view_sidebox"/>',
'no_lang' => true, 'no_lang' => true,
'link' => false, 'link' => false,
'icon' => false, 'icon' => false,
@ -102,6 +102,17 @@ class addressbook_hooks
} }
} }
/**
* Generate unique Id for addressbook view sidebox
* @param $contact_id
* @param $view
* @return string
*/
static function getViewDOMID($contact_id, $view)
{
return 'addressbook_'.$contact_id.'_'.$view.'_view_sidebox';
}
/** /**
* populates $settings for the Api\Preferences * populates $settings for the Api\Preferences
* *

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

@ -3149,7 +3149,7 @@ class addressbook_ui extends addressbook_bo
// Load CRM code // Load CRM code
Framework::includeJS('.','CRM','addressbook'); Framework::includeJS('.','CRM','addressbook');
$content['view_sidebox'] = 'addressbook_'.$contact_id.'_view_sidebox'; $content['view_sidebox'] = addressbook_hooks::getViewDOMID($contact_id, $crm_list);
$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array( $this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array(
'id' => $content['id'], 'id' => $content['id'],
'index' => $content['index'], 'index' => $content['index'],

8
addressbook/js/app.js
View File

@ -90,10 +90,12 @@ var AddressbookApp = /** @class */ (function (_super) {
break; break;
} }
jQuery('select[id*="adr_one_countrycode"]').each(function () { jQuery('select[id*="adr_one_countrycode"]').each(function () {
app.addressbook.show_custom_country(this); if (app.addressbook)
app.addressbook.show_custom_country(this);
}); });
jQuery('select[id*="adr_two_countrycode"]').each(function () { jQuery('select[id*="adr_two_countrycode"]').each(function () {
app.addressbook.show_custom_country(this); if (app.addressbook)
app.addressbook.show_custom_country(this);
}); });
}; };
/** /**
@ -206,7 +208,7 @@ var AddressbookApp = /** @class */ (function (_super) {
this.egw.openTab(id, 'addressbook', 'view', extras, { this.egw.openTab(id, 'addressbook', 'view', extras, {
displayName: data.n_fn, displayName: data.n_fn,
icon: data.photo, icon: data.photo,
id: id id: id + '_' + extras.crm_list
}); });
}; };
/** /**

6
addressbook/js/app.ts
View File

@ -92,10 +92,10 @@ class AddressbookApp extends EgwApp
} }
jQuery('select[id*="adr_one_countrycode"]').each(function() { jQuery('select[id*="adr_one_countrycode"]').each(function() {
app.addressbook.show_custom_country(this); if (app.addressbook) app.addressbook.show_custom_country(this);
}); });
jQuery('select[id*="adr_two_countrycode"]').each(function() { jQuery('select[id*="adr_two_countrycode"]').each(function() {
app.addressbook.show_custom_country(this); if (app.addressbook) app.addressbook.show_custom_country(this);
}); });
} }
@ -231,7 +231,7 @@ class AddressbookApp extends EgwApp
this.egw.openTab(id, 'addressbook', 'view', extras, { this.egw.openTab(id, 'addressbook', 'view', extras, {
displayName: data.n_fn, displayName: data.n_fn,
icon: data.photo, icon: data.photo,
id: id id: id+'_'+extras.crm_list
}); });
} }