From db9d5bf6b18f6f422b76247c3bc7f93b413bbf88 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 7 Jun 2011 09:26:07 +0000 Subject: [PATCH] switching legacy-actions off by default --- calendar/inc/class.calendar_uilist.inc.php | 2 +- infolog/inc/class.infolog_ui.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php index 122ba88d7c..e96cca1794 100644 --- a/calendar/inc/class.calendar_uilist.inc.php +++ b/calendar/inc/class.calendar_uilist.inc.php @@ -149,7 +149,7 @@ class calendar_uilist extends calendar_ui 'filter' => 'after', 'order' => 'cal_start',// IO name of the column to sort after (optional for the sortheaders) 'sort' => 'ASC',// IO direction of the sort: 'ASC' or 'DESC' - 'default_cols' => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id', + 'default_cols' => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id,legacy_actions', 'filter_onchange' => "set_style_by_class('table','custom_hide','visibility',this.value == 'custom' ? 'visible' : 'hidden'); if (this.value != 'custom') this.form.submit();", 'header_left' => 'calendar.list.dates', 'row_id' => 'row_id', // set in get rows "$event[id]:$event[recur_date]" diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 79f63dcf34..e4653c72f7 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -348,12 +348,12 @@ class infolog_ui if ($details) { $query['columnselection_pref'] = (is_object($query['template'])?$query['template']->name:'infolog.index.rows').'-details'; - $query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id'; + $query['default_cols'] = '!cat_id,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id,actions'; } else { $query['columnselection_pref'] = 'infolog.index.rows'; - $query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id'; + $query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id,actions'; } // set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols) $this->prefs['show_times'] = strpos($this->prefs['nextmatch-'.$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;