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

Avoid ID conflict between category select & tree in et2

Browse Source
This commit is contained in:
Nathan Gray 2013-02-07 10:51:00 +00:00
parent 7fb0bbc9d9
commit 42e9efac87
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1589,6 +1589,7 @@ class addressbook_ui extends addressbook_bo
unset($content['button']);
$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
$content['owner'] = (string) (int) $content['owner'];
$content['cat_id'] = $content['cat_id_tree'] ? $content['cat_id_tree'] : $content['cat_id'];
switch($button)
{
@ -1822,6 +1823,9 @@ error_log($GLOBALS['egw_info']['flags']['currentapp']);
list(,$dates) = each($this->read_calendar(array($content['id']),false));
if(is_array($dates)) $content += $dates;
}
// Avoid ID conflict with tree & selectboxes
$content['cat_id_tree'] = $content['cat_id'];
// how to display addresses
$content['addr_format'] = $this->addr_format_by_country($content['adr_one_countryname']);
$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);

4
addressbook/setup/etemplates.inc.php
View File

@ -2,7 +2,7 @@
/**
* EGroupware - eTemplates for Application addressbook
* http://www.egroupware.org
* generated by soetemplate::dump4setup() 2013-02-06 05:06
* generated by soetemplate::dump4setup() 2013-02-07 03:50
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package addressbook
@ -28,7 +28,7 @@ $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => ''
$templ_data[] = array('name' => 'addressbook.edit.access','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"c2";s:4:",top";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Publish into groups:";}s:1:"B";a:3:{s:4:"type";s:6:"manual";s:7:"onclick";s:13:"return false;";s:4:"name";s:30:"ManualAddressbookPublishgroups";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"5";s:4:"name";s:16:"published_groups";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1140005589',);
$templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,286,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";}}}','size' => '100%,286,,,,,auto','style' => '','modified' => '1165513081',);
$templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:11:"cat_id_tree";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,286,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";}}}','size' => '100%,286,,,,,auto','style' => '','modified' => '1360234197',);
$templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:32:"$cont[tid],$cont[no_private_cfs]";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,286,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"286";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,286,,row_on,0,0,auto','style' => '','modified' => '1200540144',);

4
addressbook/templates/default/edit.xet
View File

@ -167,7 +167,7 @@
</rows>
</grid>
</template>
<template id="addressbook.edit.cats" template="" lang="" group="0" version="1.9.001">
<template id="addressbook.edit.cats" template="" lang="" group="0" version="1.9.002">
<grid width="100%" height="286" overflow="auto">
<columns>
<column/>
@ -180,7 +180,7 @@
<image src="folder"/>
<description value="Categories"/>
<listbox type="select-cat" id="cat_id" rows="013" options=",width:99%"/>
<tree-cat id="cat_id" options="13,,width:99%"/>
<tree-cat id="cat_id_tree" options="13,,width:99%"/>
</row>
</rows>
</grid>