Merge pull request #455 from Abyss777/move_permissions

Move permissions windows to subfolder

13 files changed, 90 insertions, 172 deletions

diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index 9d426911..51fd3786 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.view.DevicesController', {
     requires: [
         'Traccar.view.dialog.Command',
         'Traccar.view.dialog.Device',
-        'Traccar.view.DeviceGeofences',
+        'Traccar.view.permissions.DeviceGeofences',
         'Traccar.view.BaseWindow',
         'Traccar.model.Device',
         'Traccar.model.Command'
diff --git a/web/app/view/GroupsController.js b/web/app/view/GroupsController.js
index 471e4952..871fb729 100644
--- a/web/app/view/GroupsController.js
+++ b/web/app/view/GroupsController.js
@@ -21,7 +21,7 @@ Ext.define('Traccar.view.GroupsController', {
 
     requires: [
         'Traccar.view.dialog.Group',
-        'Traccar.view.GroupGeofences',
+        'Traccar.view.permissions.GroupGeofences',
         'Traccar.view.BaseWindow',
         'Traccar.model.Group'
     ],
diff --git a/web/app/view/UserCalendars.js b/web/app/view/UserCalendars.js
deleted file mode 100644
index be9ee298..00000000
--- a/web/app/view/UserCalendars.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-Ext.define('Traccar.view.UserCalendars', {
-    extend: 'Ext.grid.Panel',
-    xtype: 'userCalendarsView',
-
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
-    columns: {
-        items: [{
-            text: Strings.sharedName,
-            dataIndex: 'name',
-            flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
-        }]
-    }
-});
diff --git a/web/app/view/UsersController.js b/web/app/view/UsersController.js
index eaae230c..6c44216d 100644
--- a/web/app/view/UsersController.js
+++ b/web/app/view/UsersController.js
@@ -22,11 +22,11 @@ Ext.define('Traccar.view.UsersController', {
 
     requires: [
         'Traccar.view.dialog.User',
-        'Traccar.view.UserDevices',
-        'Traccar.view.UserGroups',
-        'Traccar.view.UserGeofences',
-        'Traccar.view.UserCalendars',
-        'Traccar.view.UserUsers',
+        'Traccar.view.permissions.UserDevices',
+        'Traccar.view.permissions.UserGroups',
+        'Traccar.view.permissions.UserGeofences',
+        'Traccar.view.permissions.UserCalendars',
+        'Traccar.view.permissions.UserUsers',
         'Traccar.view.Notifications',
         'Traccar.view.BaseWindow',
         'Traccar.model.User'
diff --git a/web/app/view/UserUsers.js b/web/app/view/permissions/Base.js
index dca3d5ca..2b07d84c 100644
--- a/web/app/view/UserUsers.js
+++ b/web/app/view/permissions/Base.js
@@ -15,16 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
-Ext.define('Traccar.view.UserUsers', {
+Ext.define('Traccar.view.permissions.Base', {
     extend: 'Ext.grid.Panel',
-    xtype: 'userUsersView',
 
     requires: [
-        'Traccar.view.BasePermissionsController'
+        'Traccar.view.permissions.BaseController'
     ],
 
-    controller: 'basePermissionsController',
+    controller: 'base',
 
     selModel: {
         selType: 'checkboxmodel',
@@ -35,14 +33,5 @@ Ext.define('Traccar.view.UserUsers', {
     listeners: {
         beforedeselect: 'onBeforeDeselect',
         beforeselect: 'onBeforeSelect'
-    },
-
-    columns: {
-        items: [{
-            text: Strings.sharedName,
-            dataIndex: 'name',
-            flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
-        }]
     }
 });
diff --git a/web/app/view/BasePermissionsController.js b/web/app/view/permissions/BaseController.js
index 2fb2d873..dc4d6ef2 100644
--- a/web/app/view/BasePermissionsController.js
+++ b/web/app/view/permissions/BaseController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
@@ -15,9 +15,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.BasePermissionsController', {
+Ext.define('Traccar.view.permissions.BaseController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.basePermissionsController',
+    alias: 'controller.base',
 
     init: function () {
         var params = {}, linkStoreName, storeName;
diff --git a/web/app/view/DeviceGeofences.js b/web/app/view/permissions/DeviceGeofences.js
index d52a6d2e..7905b49e 100644
--- a/web/app/view/DeviceGeofences.js
+++ b/web/app/view/permissions/DeviceGeofences.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
@@ -15,27 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.DeviceGeofences', {
-    extend: 'Ext.grid.Panel',
+Ext.define('Traccar.view.permissions.DeviceGeofences', {
+    extend: 'Traccar.view.permissions.Base',
     xtype: 'deviceGeofencesView',
 
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
     columns: {
         items: [{
             text: Strings.sharedName,
diff --git a/web/app/view/GroupGeofences.js b/web/app/view/permissions/GroupGeofences.js
index ee31569c..84cec3ca 100644
--- a/web/app/view/GroupGeofences.js
+++ b/web/app/view/permissions/GroupGeofences.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
@@ -15,27 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.GroupGeofences', {
-    extend: 'Ext.grid.Panel',
+Ext.define('Traccar.view.permissions.GroupGeofences', {
+    extend: 'Traccar.view.permissions.Base',
     xtype: 'groupGeofencesView',
 
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
     columns: {
         items: [{
             text: Strings.sharedName,
diff --git a/web/app/view/permissions/UserCalendars.js b/web/app/view/permissions/UserCalendars.js
new file mode 100644
index 00000000..f45f7772
--- /dev/null
+++ b/web/app/view/permissions/UserCalendars.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+Ext.define('Traccar.view.permissions.UserCalendars', {
+    extend: 'Traccar.view.permissions.Base',
+    xtype: 'userCalendarsView',
+
+    columns: {
+        items: [{
+            text: Strings.sharedName,
+            dataIndex: 'name',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        }]
+    }
+});
diff --git a/web/app/view/UserDevices.js b/web/app/view/permissions/UserDevices.js
index e61ca905..dd6f43d2 100644
--- a/web/app/view/UserDevices.js
+++ b/web/app/view/permissions/UserDevices.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2017 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
@@ -15,27 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserDevices', {
-    extend: 'Ext.grid.Panel',
+Ext.define('Traccar.view.permissions.UserDevices', {
+    extend: 'Traccar.view.permissions.Base',
     xtype: 'userDevicesView',
 
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
     columns: {
         items: [{
             text: Strings.sharedName,
diff --git a/web/app/view/UserGeofences.js b/web/app/view/permissions/UserGeofences.js
index 06083349..49b94ff9 100644
--- a/web/app/view/UserGeofences.js
+++ b/web/app/view/permissions/UserGeofences.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
@@ -15,27 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserGeofences', {
-    extend: 'Ext.grid.Panel',
+Ext.define('Traccar.view.permissions.UserGeofences', {
+    extend: 'Traccar.view.permissions.Base',
     xtype: 'userGeofencesView',
 
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
     columns: {
         items: [{
             text: Strings.sharedName,
diff --git a/web/app/view/UserGroups.js b/web/app/view/permissions/UserGroups.js
index b1b01178..0c23713b 100644
--- a/web/app/view/UserGroups.js
+++ b/web/app/view/permissions/UserGroups.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 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
@@ -15,27 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-Ext.define('Traccar.view.UserGroups', {
-    extend: 'Ext.grid.Panel',
+Ext.define('Traccar.view.permissions.UserGroups', {
+    extend: 'Traccar.view.permissions.Base',
     xtype: 'userGroupsView',
 
-    requires: [
-        'Traccar.view.BasePermissionsController'
-    ],
-
-    controller: 'basePermissionsController',
-
-    selModel: {
-        selType: 'checkboxmodel',
-        checkOnly: true,
-        showHeaderCheckbox: false
-    },
-
-    listeners: {
-        beforedeselect: 'onBeforeDeselect',
-        beforeselect: 'onBeforeSelect'
-    },
-
     columns: {
         items: [{
             text: Strings.sharedName,
diff --git a/web/app/view/permissions/UserUsers.js b/web/app/view/permissions/UserUsers.js
new file mode 100644
index 00000000..abef700a
--- /dev/null
+++ b/web/app/view/permissions/UserUsers.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+Ext.define('Traccar.view.permissions.UserUsers', {
+    extend: 'Traccar.view.permissions.Base',
+    xtype: 'userUsersView',
+
+    columns: {
+        items: [{
+            text: Strings.sharedName,
+            dataIndex: 'name',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        }]
+    }
+});