diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-19 20:50:54 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 20:50:54 +1300 |
| commit | 4e7d2b8fdb41390205d69997d61db536545f5564 (patch) | |
| tree | aa8355566da6cf6064b4119c07ecc39feae326d7 /web/app/view/permissions | |
| parent | 464aa58c49ac5e04d419a68b6ee5bcf9d0c36798 (diff) | |
| parent | ebccd5864e93312321c0226d603e453f6cdeec25 (diff) | |
| download | etbsa-traccar-web-4e7d2b8fdb41390205d69997d61db536545f5564.tar.gz etbsa-traccar-web-4e7d2b8fdb41390205d69997d61db536545f5564.tar.bz2 etbsa-traccar-web-4e7d2b8fdb41390205d69997d61db536545f5564.zip | |
Merge pull request #655 from Abyss777/calendar_column
Add Calendar column to some grids
Diffstat (limited to 'web/app/view/permissions')
| -rw-r--r-- | web/app/view/permissions/Geofences.js | 14 | ||||
| -rw-r--r-- | web/app/view/permissions/Notifications.js | 16 |
2 files changed, 27 insertions, 3 deletions
diff --git a/web/app/view/permissions/Geofences.js b/web/app/view/permissions/Geofences.js index efdf18d..e2e85a3 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 9386d6d..e21d277 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') }] } }); |