changeset 1141:e5e4eb249d9c

merged.
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 26 May 2016 14:06:30 +0200
parents 450368f67858 (diff) 53d108efab0b (current diff)
children 255d550e74f4
files app/view/grid/Orte.js
diffstat 3 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/app/model/Ort.js	Wed May 25 19:06:29 2016 +0200
+++ b/app/model/Ort.js	Thu May 26 14:06:30 2016 +0200
@@ -71,6 +71,9 @@
             }
             return new Date(v);
         }
+    }, {
+        name: 'readonly',
+        type: 'boolean'
     }],
 
     idProperty: 'id',
--- a/app/view/grid/Orte.js	Wed May 25 19:06:29 2016 +0200
+++ b/app/view/grid/Orte.js	Thu May 26 14:06:30 2016 +0200
@@ -79,7 +79,8 @@
         }, {
             header: i18n.getMsg('orte.ortId'),
             editor: {
-                xtype: 'textfield'
+                xtype: 'textfield',
+                allowBlank: false
             },
             dataIndex: 'ortId'
         }, {
@@ -178,13 +179,15 @@
         }, {
             header: i18n.getMsg('orte.kurztext'),
             editor: {
-                xtype: 'textfield'
+                xtype: 'textfield',
+                allowBlank: false
             },
             dataIndex: 'kurztext'
         }, {
             header: i18n.getMsg('orte.langtext'),
             editor: {
-                xtype: 'textfield'
+                xtype: 'textfield',
+                allowBlank: false
             },
             dataIndex: 'langtext'
         }, {
@@ -202,13 +205,15 @@
         }, {
             header: i18n.getMsg('orte.koordXExtern'),
             editor: {
-                xtype: 'textfield'
+                xtype: 'textfield',
+                allowBlank: false
             },
             dataIndex: 'koordXExtern'
         }, {
             header: i18n.getMsg('orte.koordYExtern'),
             editor: {
-                xtype: 'textfield'
+                xtype: 'textfield',
+                allowBlank: false
             },
             dataIndex: 'koordYExtern'
         }, {
--- a/app/view/window/Ortszuordnung.js	Wed May 25 19:06:29 2016 +0200
+++ b/app/view/window/Ortszuordnung.js	Thu May 26 14:06:30 2016 +0200
@@ -45,7 +45,7 @@
                             + ' '
                             + i18n.getMsg('probe')
                             + ' '
-                            + this.probe.get('hauptprobennr')
+                            + this.probe.get('hauptprobenNr')
                             + ' '
                             + i18n.getMsg('edit');
         }
@@ -57,7 +57,7 @@
                             + ' '
                             + i18n.getMsg('probe')
                             + ' '
-                            + this.probe.get('hauptprobennr')
+                            + this.probe.get('hauptprobenNr')
                             + ' '
                             + i18n.getMsg('create');
         }

http://lada.wald.intevation.org