Author: echatellier Date: 2013-04-04 15:54:38 +0200 (Thu, 04 Apr 2013) New Revision: 197 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/197 Log: Fix rebuild panel message update Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 2013-04-02 14:01:15 UTC (rev 196) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 2013-04-04 13:54:38 UTC (rev 197) @@ -26,7 +26,7 @@ <wicket:panel> <form wicket:id="Form"> <input type="submit" wicket:message="value:Rebuild" wicket:id="Rebuild" /> - <span wicket:id="rebuildResult" /> + <span wicket:id="Status" /> </form> </wicket:panel> </html> \ No newline at end of file Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-04-02 14:01:15 UTC (rev 196) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-04-04 13:54:38 UTC (rev 197) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -27,7 +27,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -37,7 +36,7 @@ /** * Panel qui permet de reconstruire l'index lucene. * - * @author Eric Chattellier + * @author Eric Chatellier */ public class RebuildLuceneIndexPanel extends Panel { @@ -54,29 +53,29 @@ final Form<Void> formView = new Form<Void>("Form"); - final IModel<String> messageModel = Model.of(""); - final Label rebuildResultLabel = new Label("rebuildResult", messageModel); - rebuildResultLabel.setOutputMarkupId(true); + final IModel<String> stringLabel = Model.of(""); + final Label label = new Label("Status", stringLabel); + label.setOutputMarkupId(true); + formView.add(label); - final Button addButton = new AjaxFallbackButton("Rebuild", formView) { + + final AjaxFallbackButton addButton = new AjaxFallbackButton("Rebuild", formView) { @Override - protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - messageModel.setObject("Rebuilding..."); - setEnabled(false); + protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) { searchService.reIndex(); - messageModel.setObject("Done."); - setEnabled(true); - target.add(rebuildResultLabel); + stringLabel.setObject("Done"); + target.add(label); } @Override protected void onError(AjaxRequestTarget target, Form<?> form) { - messageModel.setObject("Error (see logs)."); - target.add(rebuildResultLabel); + stringLabel.setObject("Error"); + target.add(label); } }; + addButton.setOutputMarkupId(true); formView.add(addButton); - formView.add(rebuildResultLabel); + add(formView); } }