diff options
| author | ninioe <ninioe@gmail.com> | 2016-08-01 16:12:47 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-08-01 16:12:47 +0300 |
| commit | 94781fa3ba35e494e309aee19a5e15c14d3193c1 (patch) | |
| tree | a1e4a90e9a2fce3db8bc51981aeb8a23cced5e6d /web/app/model | |
| parent | b4841fa0a6293c0b895cf6bb65c6c2d871c78397 (diff) | |
| parent | e177e7d083a4dd3f64172802661bf658d26d1163 (diff) | |
| download | trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.tar.gz trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.tar.bz2 trackermap-server-94781fa3ba35e494e309aee19a5e15c14d3193c1.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'web/app/model')
| -rw-r--r-- | web/app/model/Group.js | 2 | ||||
| -rw-r--r-- | web/app/model/Server.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/web/app/model/Group.js b/web/app/model/Group.js index a28897feb..bb18b5b3f 100644 --- a/web/app/model/Group.js +++ b/web/app/model/Group.js @@ -27,5 +27,7 @@ Ext.define('Traccar.model.Group', { }, { name: 'groupId', type: 'int' + }, { + name: 'attributes' }] }); diff --git a/web/app/model/Server.js b/web/app/model/Server.js index 3f6e466d9..02968c2d6 100644 --- a/web/app/model/Server.js +++ b/web/app/model/Server.js @@ -54,6 +54,8 @@ Ext.define('Traccar.model.Server', { }, { name: 'twelveHourFormat', type: 'boolean' + }, { + name: 'attributes' }], proxy: { |