From ebccd5864e93312321c0226d603e453f6cdeec25 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 19 Mar 2018 12:34:49 +0500 Subject: Add Calendar column to some grids --- web/app/view/permissions/Geofences.js | 14 +++++++++++++- web/app/view/permissions/Notifications.js | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) (limited to 'web/app/view/permissions') diff --git a/web/app/view/permissions/Geofences.js b/web/app/view/permissions/Geofences.js index efdf18da..e2e85a36 100644 --- a/web/app/view/permissions/Geofences.js +++ b/web/app/view/permissions/Geofences.js @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,18 @@ Ext.define('Traccar.view.permissions.Geofences', { flex: 1, minWidth: Traccar.Style.columnWidthNormal, filter: 'string' + }, { + text: Strings.sharedCalendar, + dataIndex: 'calendarId', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal, + hidden: true, + filter: { + type: 'list', + labelField: 'name', + store: 'AllCalendars' + }, + renderer: Traccar.AttributeFormatter.getFormatter('calendarId') }] } }); diff --git a/web/app/view/permissions/Notifications.js b/web/app/view/permissions/Notifications.js index 9386d6d6..e21d277f 100644 --- a/web/app/view/permissions/Notifications.js +++ b/web/app/view/permissions/Notifications.js @@ -1,6 +1,6 @@ /* - * Copyright 2017 Anton Tananaev (anton@traccar.org) - * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) + * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2017 - 2018 Andrey Kunitsyn (andrey@traccar.org) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,6 +62,18 @@ Ext.define('Traccar.view.permissions.Notifications', { minWidth: Traccar.Style.columnWidthNormal, renderer: Traccar.AttributeFormatter.getFormatter('sms'), filter: 'boolean' + }, { + text: Strings.sharedCalendar, + dataIndex: 'calendarId', + flex: 1, + minWidth: Traccar.Style.columnWidthNormal, + hidden: true, + filter: { + type: 'list', + labelField: 'name', + store: 'AllCalendars' + }, + renderer: Traccar.AttributeFormatter.getFormatter('calendarId') }] } }); -- cgit v1.2.3