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

Remove auto-hide of columns, it doesn't work with being able to choose columns & infinite scrolling.

Browse Source
This commit is contained in:
Nathan Gray 2014-07-21 15:31:27 +00:00
parent 7cf1d222ae
commit 84a8a03c23
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,15 +153,6 @@ class addressbook_hooks
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => false, 'admin' => false,
); );
$settings['no_auto_hide'] = array(
'type' => 'check',
'label' => 'Don\'t hide empty columns',
'name' => 'no_auto_hide',
'help' => 'Should the columns photo and home address always be displayed, even if they are empty.',
'xmlrpc' => True,
'admin' => false,
'forced' => false,
);
$fileas_options = ExecMethod('addressbook.addressbook_bo.fileas_options'); $fileas_options = ExecMethod('addressbook.addressbook_bo.fileas_options');
$settings['link_title'] = array( $settings['link_title'] = array(
'type' => 'select', 'type' => 'select',

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

@ -1499,7 +1499,6 @@ window.egw_LAB.wait(function() {
$order = $query['order']; $order = $query['order'];
$readonlys = array(); $readonlys = array();
$photos = $homeaddress = $roles = $notes = false;
foreach($rows as $n => &$row) foreach($rows as $n => &$row)
{ {
$given = $row['n_given'] ? $row['n_given'] : ($row['n_prefix'] ? $row['n_prefix'] : ''); $given = $row['n_given'] ? $row['n_given'] : ($row['n_prefix'] ? $row['n_prefix'] : '');
@ -1570,9 +1569,6 @@ window.egw_LAB.wait(function() {
unset($row['jpegphoto']); // unused and messes up json encoding (not utf-8) unset($row['jpegphoto']); // unused and messes up json encoding (not utf-8)
if ($row['photo']) $photos = true;
if ($row['role']) $roles = true;
if ($row['note']) $notes = true;
if (isset($customfields[$row['id']])) if (isset($customfields[$row['id']]))
{ {
foreach($this->customfields as $name => $data) foreach($this->customfields as $name => $data)
@ -1592,13 +1588,6 @@ window.egw_LAB.wait(function() {
$row[$name] = $data; $row[$name] = $data;
} }
} }
if ($this->prefs['home_column'] != 'never' && !$homeaddress)
{
foreach(array('adr_two_countryname','adr_two_locality','adr_two_postalcode','adr_two_street','adr_two_street2') as $name)
{
if ($row[$name]) $homeaddress = true;
}
}
} }
// hide region for address format 'postcode_city' // hide region for address format 'postcode_city'
@ -1613,20 +1602,8 @@ window.egw_LAB.wait(function() {
} }
$readonlys['no_distrib_lists'] = (bool)$show_distributionlist; $readonlys['no_distrib_lists'] = (bool)$show_distributionlist;
if (!$this->prefs['no_auto_hide'])
{
// disable photo column, if view contains no photo(s)
if (!$photos) $rows['no_photo'] = true;
// disable homeaddress column, if we have no homeaddress(es)
if (!$homeaddress) $rows['no_home_adr_two_countrycode_adr_two_postalcode'] = true;
// disable roles column
if (!$roles) $rows['no_role'] = true;
// disable note column
if (!$notes) $rows['no_note'] = true;
}
// 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) $rows['no_customfields'] = true;
$rows['order'] = $order; $rows['order'] = $order;
$rows['call_popup'] = $this->config['call_popup']; $rows['call_popup'] = $this->config['call_popup'];

10
addressbook/templates/default/index.xet
View File

@ -37,16 +37,16 @@
<columns> <columns>
<column width="20"/> <column width="20"/>
<column/> <column/>
<column disabled="@no_role"/>
<column/>
<column width="60" disabled="@no_photo"/>
<column/> <column/>
<column/> <column/>
<column disabled="@no_home_adr_two_countrycode_adr_two_postalcode"/> <column width="60"/>
<column/>
<column/>
<column/>
<column/> <column/>
<column/> <column/>
<column disabled="@no_customfields"/> <column disabled="@no_customfields"/>
<column disabled="@no_note"/> <column/>
<column disabled="@no_distribution_list"/> <column disabled="@no_distribution_list"/>
<column/> <column/>
<column/> <column/>