# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1464881579 -7200
# Node ID 9486001a01ca8a2d82abf899634e22dbd654de9b
# Parent  7b3ddb7e9641308220df0239aff2440bc1024a23# Parent  80e7eb414fc8a2f9fda53428387c1582d66ff408
merged.

diff -r 7b3ddb7e9641 -r 9486001a01ca .hgtags
--- a/.hgtags	Thu Jun 02 12:30:27 2016 +0200
+++ b/.hgtags	Thu Jun 02 17:32:59 2016 +0200
@@ -57,3 +57,4 @@
 0000000000000000000000000000000000000000 2.1.1
 8ffaeb6ac4a4288203ab428cb64d6ea93a1d0b40 2.1.1
 e2a26f9733ee5ecbbec30a5878445e29d11a0a1d 2.2.0
+860f03b39a830268f9320a81e64f7ab6b8ab9fce 2.3.0
diff -r 7b3ddb7e9641 -r 9486001a01ca app/controller/form/Ortszuordnung.js
--- a/app/controller/form/Ortszuordnung.js	Thu Jun 02 12:30:27 2016 +0200
+++ b/app/controller/form/Ortszuordnung.js	Thu Jun 02 17:32:59 2016 +0200
@@ -152,7 +152,9 @@
      */
     dirtyForm: function(form, dirty) {
         if (dirty) {
-            if (form.getValues().ortId !== '') {
+            if (form.getValues().ortId !== ''
+                && /[UEZA]/.test(form.getValues().ortszuordnungTyp)
+               ) {
                 form.owner.down('button[action=save]').setDisabled(false);
             }
             form.owner.down('button[action=discard]').setDisabled(false);
diff -r 7b3ddb7e9641 -r 9486001a01ca app/view/form/Ortszuordnung.js
--- a/app/view/form/Ortszuordnung.js	Thu Jun 02 12:30:27 2016 +0200
+++ b/app/view/form/Ortszuordnung.js	Thu Jun 02 17:32:59 2016 +0200
@@ -79,11 +79,12 @@
                         name: 'ortszusatztext',
                         fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszusatztext')
                     }, {
-                        xtype: 'tfield',
+                        xtype: 'textfield',
                         labelWidth: 125,
                         maxLength: 1,
                         allowBlank: false,
-                        regex: /[U,E,Z,A]/,
+                        regex: /[UEZA]/,
+                        activeError: 'U, E, Z oder A eingeben',
                         name: 'ortszuordnungTyp',
                         fieldLabel: i18n.getMsg('ortszuordnung.form.field.ortszuordnungtyp')
                     }, {
@@ -219,12 +220,11 @@
 
     clearMessages: function() {
         this.down('tfield[name=ortszusatztext]').clearWarningOrError();
-        this.down('tfield[name=ortszuordnungTyp]').clearWarningOrError();
      },
 
     setReadOnly: function(value) {
         this.down('tfield[name=ortszusatztext]').setReadOnly(value);
-        this.down('tfield[name=ortszuordnungTyp]').setReadOnly(value);
+        this.down('textfield[name=ortszuordnungTyp]').setReadOnly(value);
     }
 });
 
diff -r 7b3ddb7e9641 -r 9486001a01ca app/view/window/MessungEdit.js
--- a/app/view/window/MessungEdit.js	Thu Jun 02 12:30:27 2016 +0200
+++ b/app/view/window/MessungEdit.js	Thu Jun 02 17:32:59 2016 +0200
@@ -47,15 +47,6 @@
             return;
         }
 
-        var messstelle = Ext.data.StoreManager.get('messstellen')
-            .getById(this.probe.get('mstId'));
-
-        this.title = 'Messung: ' + this.record.get('nebenprobenNr')
-            + '   zu Probe: ' + this.probe.get('probeIdAlt')
-            + ' Mst: ' + messstelle.get('messStelle')
-            + ' editieren.';
-
-
         this.buttons = [{
             text: 'Schließen',
             scope: this,
@@ -161,6 +152,14 @@
                 }
                 this.down('messungform').setRecord(record);
                 this.record = record;
+
+                var messstelle = Ext.data.StoreManager.get('messstellen')
+                    .getById(this.probe.get('mstId'));
+                this.setTitle('Messung: ' + this.record.get('nebenprobenNr')
+                              + '   zu Probe: ' + this.probe.get('probeIdAlt')
+                              + ' Mst: ' + messstelle.get('messStelle')
+                              + ' editieren.');
+
                 var json = Ext.decode(response.response.responseText);
                 if (json) {
                     this.setMessages(json.errors, json.warnings);
diff -r 7b3ddb7e9641 -r 9486001a01ca custom-vhosts.conf
--- a/custom-vhosts.conf	Thu Jun 02 12:30:27 2016 +0200
+++ b/custom-vhosts.conf	Thu Jun 02 17:32:59 2016 +0200
@@ -30,8 +30,8 @@
     RequestHeader set X-SHIB-roles "cn=mst_11010"
 
     # Add Proxy for Lada-server
-    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
-    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
+    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
     # Add Proxy for printing
     #ProxyPass /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print
     #ProxyPassReverse /lada-client/lada-printer http://MAPFISH-PRINT-URL/lada_print
@@ -45,11 +45,11 @@
     # Fake Shibboleth-like authentication headers
     RequestHeader set X-SHIB-user "testeins"
     # Status-Erfasser
-    RequestHeader set X-SHIB-roles "cn=mst_11010_status,cn=land_11_status"
+    RequestHeader set X-SHIB-roles "cn=mst_11010_status"
 
     # Add Proxy for Lada-server
-    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
-    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
+    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
 </VirtualHost>
 
 <VirtualHost *:82>
@@ -63,8 +63,8 @@
     RequestHeader set X-SHIB-roles "cn=land_11_status"
 
     # Add Proxy for Lada-server
-    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
-    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
+    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
 </VirtualHost>
 
 <VirtualHost *:83>
@@ -78,8 +78,8 @@
     RequestHeader set X-SHIB-roles "cn=lst_kiel"
 
     # Add Proxy for Lada-server
-    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
-    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
+    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
 </VirtualHost>
 
 <VirtualHost *:84>
@@ -93,6 +93,6 @@
     RequestHeader set X-SHIB-roles "cn=land_06_stamm"
 
     # Add Proxy for Lada-server
-    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
-    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.2.0/"
+    ProxyPass "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
+    ProxyPassReverse "/lada-server/" "http://lada-server:8080/lada-server-2.3.0/"
 </VirtualHost>