Mercurial > lada > lada-client
changeset 846:af9d506b0700
always modify the netzbetreiber when the Messstelle was changed
| author | Dustin Demuth <dustin@intevation.de> |
|---|---|
| date | Tue, 07 Jul 2015 14:14:00 +0200 |
| parents | 1449d58d6f58 |
| children | 95d40ca7bb70 |
| files | app/controller/form/Messprogramm.js app/controller/form/Probe.js |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/form/Messprogramm.js Tue Jul 07 13:01:35 2015 +0200 +++ b/app/controller/form/Messprogramm.js Tue Jul 07 14:14:00 2015 +0200 @@ -81,16 +81,13 @@ /** * When a Messtelle is selected, modify the Netzbetreiber * according to the Messstelle - * TODO: The conditions when to apply this automatism are still - * unclear. Right now it is only applied when the NB is not set. */ setNetzbetreiber: function(combo, records){ var netzbetreiber = combo.up().up('form') .down('netzbetreiber').down('combobox'); var nbId = records[0].get('netzbetreiberId'); - if (nbId != null && - (netzbetreiber.value === '' || netzbetreiber.value === null)) { + if (nbId != null) { //select the NB in the NB-Combobox netzbetreiber.select(nbId); }
--- a/app/controller/form/Probe.js Tue Jul 07 13:01:35 2015 +0200 +++ b/app/controller/form/Probe.js Tue Jul 07 14:14:00 2015 +0200 @@ -61,16 +61,13 @@ /** * When a Messtelle is selected, modify the Netzbetreiber * according to the Messstelle - * TODO: The conditions when to apply this automatism are still - * unclear. Right now it is only applied when the NB is not set. */ setNetzbetreiber: function(combo, records){ var netzbetreiber = combo.up().up('form') .down('netzbetreiber').down('combobox'); var nbId = records[0].get('netzbetreiberId'); - if (nbId != null && - (netzbetreiber.value === '' || netzbetreiber.value === null)) { + if (nbId != null) { //select the NB in the NB-Combobox netzbetreiber.select(nbId); }