Mercurial > lada > lada-client
changeset 675:fe527f380b10
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 23 Mar 2015 18:03:48 +0100 |
| parents | 19d3b1f2613e (current diff) 08e3e7b80a34 (diff) |
| children | 0d5fb0f585f1 |
| files | app/store/ProbenList.js app/view/form/Location.js |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/app/model/ProbeList.js Thu Mar 19 14:52:20 2015 +0100 +++ b/app/model/ProbeList.js Mon Mar 23 18:03:48 2015 +0100 @@ -18,14 +18,14 @@ }], idProperty: 'id', - totalProperty: 'totalCount', proxy: { type: 'rest', url: 'lada-server/probe', reader: { type: 'json', - root: 'data' + root: 'data', + totalProperty: 'totalCount' } } });
--- a/app/store/ProbenList.js Thu Mar 19 14:52:20 2015 +0100 +++ b/app/store/ProbenList.js Mon Mar 23 18:03:48 2015 +0100 @@ -12,6 +12,6 @@ Ext.define('Lada.store.ProbenList', { extend: 'Ext.data.Store', model: 'Lada.model.ProbeList', - pageSize: 5, + pageSize: 50, remoteSort: true });
--- a/app/view/form/Location.js Thu Mar 19 14:52:20 2015 +0100 +++ b/app/view/form/Location.js Mon Mar 23 18:03:48 2015 +0100 @@ -81,6 +81,7 @@ xtype: 'verwaltungseinheit', name: 'verwaltungseinheitId', fieldLabel: 'Gemeinde', + editable: true, width: 280, labelWidth: 80 }, {
--- a/app/view/form/Probe.js Thu Mar 19 14:52:20 2015 +0100 +++ b/app/view/form/Probe.js Mon Mar 23 18:03:48 2015 +0100 @@ -179,10 +179,14 @@ } }, { xtype: 'textfield', - maxLength: 100, + maxLength: 38, + enforceMaxLength: true, name: 'mediaDesk', labelWidth: 125, fieldLabel: 'Deskriptoren', + regex: new RegExp('(?:D: ){1}(?:[0-9]{2} ){11}[0-9]{2}'), + regexText: 'Die Deskriptoren haben das falsche Format.<br />'+ + 'Richtig wäre: D: 99 99 99 99 99 99 99 99 99 99 99 99', listeners: { dirtychange: { fn: this.updateOnChange,