# HG changeset patch # User Maximilian Krambach # Date 1485974286 -3600 # Node ID 16a80ca1673242daaff3fa47f50fd16270370f27 # Parent 317ae6bfd647ce5a848281c71ebad629d931448c map feature visibility, selection and grid layout messpunkt layer is now visible per default when in editing mode on selection in map, the form is updated ortszuordnung buttons should not render over grid anymore diff -r 317ae6bfd647 -r 16a80ca16732 app/controller/form/Ortszuordnung.js --- a/app/controller/form/Ortszuordnung.js Wed Feb 01 18:54:31 2017 +0100 +++ b/app/controller/form/Ortszuordnung.js Wed Feb 01 19:38:06 2017 +0100 @@ -123,21 +123,26 @@ var osg = win.down('ortstammdatengrid'); var oForm = button.up('form'); osg.addListener('select',oForm.setOrt, oForm); + var map = win.down('map'); if (pressed) { win.setHeight(Ext.getBody().getViewSize().height - 50); button.setText(i18n.getMsg('ortszuordnung.form.setOrt.pressed')); + map.featureLayer.setVisibility(true); win.setY(25); gridPanel.show(); + win.doLayout(); osg.addListener('select',oForm.setOrt, oForm); } else { - var y = (Ext.getBody().getViewSize().height - 465) / 2 + map.featureLayer.setVisibility(false); + var y = (Ext.getBody().getViewSize().height - 465) / 2; win.setHeight(465); win.setY(y); button.setText(i18n.getMsg('ortszuordnung.form.setOrt')); gridPanel.hide(); osg.removeListener('select',oForm.setOrt, oForm); + oForm.doLayout(); } }, diff -r 317ae6bfd647 -r 16a80ca16732 app/view/grid/Orte.js --- a/app/view/grid/Orte.js Wed Feb 01 18:54:31 2017 +0100 +++ b/app/view/grid/Orte.js Wed Feb 01 19:38:06 2017 +0100 @@ -283,5 +283,9 @@ var id = feature[0].data.id; var record = this.store.getById(id); this.getSelectionModel().select(record); + var win = this.up('ortszuordnungwindow'); + if (win){ + win.down('ortszuordnungform').setOrt(null, record); + } } });