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

"- fix for bug #2097: Addressbook bug when filemanager is disabled

Browse Source 
- fixed not working export limit"
This commit is contained in:
Ralf Becker 2009-05-30 07:39:58 +00:00
parent 75f4a3920e
commit 88d92e78f9
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class addressbook_ui extends addressbook_bo
$this->config =& $GLOBALS['egw_info']['server']; $this->config =& $GLOBALS['egw_info']['server'];
// check if a contact specific export limit is set, if yes use it also for etemplate's csv export // check if a contact specific export limit is set, if yes use it also for etemplate's csv export
if (!$this->config['contact_export_limit']) if ($this->config['contact_export_limit'])
{ {
$this->config['export_limit'] = $this->config['contact_export_limit']; $this->config['export_limit'] = $this->config['contact_export_limit'];
} }
@ -311,9 +311,6 @@ class addressbook_ui extends addressbook_bo
$sel_options['col_filter[tid]'][$tid] = $data['name']; $sel_options['col_filter[tid]'][$tid] = $data['name'];
} }
} }
// disable filemanger icon if user has no access to filemanager
$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
// get the availible org-views plus the label of the contacts view of one org // get the availible org-views plus the label of the contacts view of one org
$sel_options['org_view'] = $this->org_views; $sel_options['org_view'] = $this->org_views;
if (isset($org_view)) $content['nm']['org_view'] = $org_view; if (isset($org_view)) $content['nm']['org_view'] = $org_view;
@ -1065,11 +1062,8 @@ class addressbook_ui extends addressbook_bo
if (($row['addr_format'] = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']); if (($row['addr_format'] = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']); if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
} }
if ($show_distributionlist) { $readonlys['no_distrib_lists'] = (bool)$show_distributionlist;
$readonlys['no_distrib_lists'] =true;
} else {
$readonlys['no_distrib_lists'] =false;
}
if (!$this->prefs['no_auto_hide']) if (!$this->prefs['no_auto_hide'])
{ {
// disable photo column, if view contains no photo(s) // disable photo column, if view contains no photo(s)
@ -1082,6 +1076,9 @@ class addressbook_ui extends addressbook_bo
// disable customfields column, if we have no customefield(s) // disable customfields column, if we have no customefield(s)
if (!$this->customfields/* || !$this->prefs['no_auto_hide'] && !$customfields*/) $rows['no_customfields'] = true; if (!$this->customfields/* || !$this->prefs['no_auto_hide'] && !$customfields*/) $rows['no_customfields'] = true;
// disable filemanger icon if user has no access to filemanager
$readonlys['filemanager/navbar'] = !isset($GLOBALS['egw_info']['user']['apps']['filemanager']);
$rows['order'] = $order; $rows['order'] = $order;
$rows['call_popup'] = $this->config['call_popup']; $rows['call_popup'] = $this->config['call_popup'];
$rows['customfields'] = array_values($this->customfields); $rows['customfields'] = array_values($this->customfields);