# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1464264390 -7200
# Node ID e5e4eb249d9c9228453fc0c0003caaa51dc0c7a7
# Parent  450368f678587d29023f00e73615034d7071662c# Parent  53d108efab0b66701e542ea3ce5e7095bbdc83c4
merged.

diff -r 53d108efab0b -r e5e4eb249d9c app/model/Ort.js
--- 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',
diff -r 53d108efab0b -r e5e4eb249d9c app/view/grid/Orte.js
--- 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'
         }, {
diff -r 53d108efab0b -r e5e4eb249d9c app/view/window/Ortszuordnung.js
--- 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');
         }