Author: echatellier Date: 2013-02-27 11:49:32 +0100 (Wed, 27 Feb 2013) New Revision: 163 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/163 Log: fixes #2015: Interface "Molecule" - Chemdoodle field reinitialized Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-27 10:40:04 UTC (rev 162) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-27 10:49:32 UTC (rev 163) @@ -66,12 +66,12 @@ import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; +import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox; import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; -import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.HiddenField; @@ -220,23 +220,19 @@ // div qui englobe les champs visible ssi nouvMolecul est coché final MarkupContainer nouvMoleculRefresh = new WebMarkupContainer("Molecule.nouvMolecul.Refresh"); - nouvMoleculRefresh.setOutputMarkupId(true); + nouvMoleculRefresh.setOutputMarkupPlaceholderTag(true); nouvMoleculRefresh.setVisible(moleculeModel.getObject().isNouvMolecul()); formView.add(nouvMoleculRefresh); // predéclaration des champs activé par la chec formView.add(new SimpleTooltipPanel("Molecule.nouvMolecul.info", new Model<String>( getString("Molecule.nouvMolecul.info")))); - formView.add(new CheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) { + formView.add(new AjaxCheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) { @Override - protected void onSelectionChanged(Boolean newSelection) { - nouvMoleculRefresh.setVisible(newSelection); + protected void onUpdate(AjaxRequestTarget target) { + nouvMoleculRefresh.setVisible(moleculeModel.getObject().isNouvMolecul()); + target.add(nouvMoleculRefresh); } - - @Override - protected boolean wantOnSelectionChangedNotifications() { - return true; - } }.setEnabled(updateOrDeleteEnabled)); AutoCompleteTextFieldString identifieeParInput = new AutoCompleteTextFieldString("Molecule.identifieePar",