Mercurial > lada > lada-client
changeset 1153:9486001a01ca
merged.
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Thu, 02 Jun 2016 17:32:59 +0200 (2016-06-02) |
parents | 7b3ddb7e9641 (current diff) 80e7eb414fc8 (diff) |
children | 2309b6ffb069 |
files | |
diffstat | 5 files changed, 27 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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); } });
--- 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);
--- 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>