extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Addressbook - Add site configuration to disable Last/Next Event column

Browse Source
This commit is contained in:
nathangray 2018-12-10 09:50:34 -07:00
parent 68a316fb3f
commit d15841e3eb
4 changed files with 23 additions and 3 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

@ -1715,7 +1715,7 @@ class addressbook_ui extends addressbook_bo
if (!$id_only && $rows)
{
$show_custom_fields = (in_array('customfields',$columselection)) && $this->customfields;
$show_calendar = in_array('calendar_calendar',$columselection);
$show_calendar = !$this->config['disable_event_column'] && in_array('calendar_calendar',$columselection);
$show_distributionlist = in_array('distrib_lists',$columselection) || count($available_distib_lists);
if ($show_calendar || $show_custom_fields || $show_distributionlist)
{
@ -1866,7 +1866,16 @@ class addressbook_ui extends addressbook_bo
$rows['no_distribution_list'] = (bool)$query['filter2'];
// disable customfields column, if we have no customefield(s)
if (!$this->customfields) $rows['no_customfields'] = true;
if (!$this->customfields)
{
$rows['no_customfields'] = true;
}
// Disable next/last date if so configured
if($this->config['disable_event_column'])
{
$rows['no_event_column'] = true;
}
$rows['order'] = $order;
$rows['call_popup'] = $this->config['call_popup'];

1
addressbook/lang/egw_en.lang
View File

@ -183,6 +183,7 @@ deletes the photo addressbook en Deletes the photo
department common en Department
departments addressbook en Departments
directory with documents to insert contacts addressbook en Directory with documents to insert contacts
disable Last/Next Event column addressbook en Disable Last/Next Event column
display contact addressbook en Display contact
displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon). addressbook en Display birthdays on the Home page.
distribution list deleted addressbook en Distribution list deleted

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

@ -27,6 +27,16 @@
<description value="Choose pre-defined map source or use custom URL (use %r = street, %t = city, %c = country, %z = zipcode)" label="%s:"/>
<taglist id="newsettings[geolocation_url]" maxSelection="1" empty_label="Select a map or write an URL"/>
</row>
<row>
<description value="Calendar integration" span="all" class="subHeader"/>
</row>
<row>
<description value="Disable Last/Next Event column"/>
<select id="newsettings[disable_event_column]">
<option value="">Allow</option>
<option value="True">Disabled</option>
</select>
</row>
<row>
<description value="Allow users to maintain their own account-data" span="all" class="subHeader"/>
</row>

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

@ -21,7 +21,7 @@
<column width="80" disabled="@no_distribution_list"/>
<column width="80"/>
<column width="50"/>
<column width="80"/>
<column width="80" disabled="@no_event_column"/>
<column width="120"/>
</columns>
<rows>