diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index e9243240a9..00a31f1cf4 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1763,9 +1763,9 @@ window.egw_LAB.wait(function() {
$ids = $calendar_participants = array();
if (!$id_only && $rows)
{
- $show_custom_fields = (!$columselection || in_array('customfields',$columselection) || $query['csv_export']) && $this->customfields;
- $show_calendar = !$columselection || in_array('calendar_calendar',$columselection);
- $show_distributionlist = !$columselection || in_array('distrib_lists',$columselection) || count($available_distib_lists);
+ $show_custom_fields = (in_array('customfields',$columselection)) && $this->customfields;
+ $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)
{
foreach($rows as $val)
@@ -1917,7 +1917,16 @@ window.egw_LAB.wait(function() {
$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'];
diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang
index d2da19f636..093e25b8bf 100644
--- a/addressbook/lang/egw_en.lang
+++ b/addressbook/lang/egw_en.lang
@@ -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
diff --git a/addressbook/templates/default/config.xet b/addressbook/templates/default/config.xet
index c7166d9ec2..e818620d67 100644
--- a/addressbook/templates/default/config.xet
+++ b/addressbook/templates/default/config.xet
@@ -27,6 +27,16 @@
+
+
+
+
+
+
+
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index d5cdcc6e3b..3357c36eb7 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -21,7 +21,7 @@
-
+