Merge pull request #382 from Abyss777/cleanup_calendars

Rename calendarData to data

3 files changed, 4 insertions, 4 deletions

diff --git a/web/app/model/Calendar.js b/web/app/model/Calendar.js
index 00b076b3..8c44d625 100644
--- a/web/app/model/Calendar.js
+++ b/web/app/model/Calendar.js
@@ -27,7 +27,7 @@ Ext.define('Traccar.model.Calendar', {
         name: 'name',
         type: 'string'
     }, {
-        name: 'calendarData'
+        name: 'data'
     }, {
         name: 'attributes'
     }]
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js
index 2609a6da..795c2c62 100644
--- a/web/app/view/CalendarDialog.js
+++ b/web/app/view/CalendarDialog.js
@@ -50,9 +50,9 @@ Ext.define('Traccar.view.CalendarDialog', {
             }
         }, {
             xtype: 'hiddenfield',
-            name: 'calendarData',
+            name: 'data',
             allowBlank: false,
-            reference: 'calendarDataField'
+            reference: 'dataField'
         }]
     }
 });
diff --git a/web/app/view/CalendarDialogController.js b/web/app/view/CalendarDialogController.js
index 48400bc5..a111ded6 100644
--- a/web/app/view/CalendarDialogController.js
+++ b/web/app/view/CalendarDialogController.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.CalendarDialogController', {
         if (fileField.fileInputEl.dom.files.length > 0) {
             reader = new FileReader();
             reader.onload = function (event) {
-                fileField.up('window').lookupReference('calendarDataField').setValue(
+                fileField.up('window').lookupReference('dataField').setValue(
                         btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result))));
             };
             reader.onerror = function (event) {