Changeset 6433

Timestamp:

08/11/15 09:42:36 (9 years ago)

Author:

Twan Goosen

Message:

Merged fix for #784 to 3.2 branch

File:

• vlo/branches/vlo-3.2/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java (modified) (3 diffs)

vlo/branches/vlo-3.2/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
+import eu.clarin.cmdi.vlo.wicket.model.PermaLinkModel;
 import eu.clarin.cmdi.vlo.wicket.panels.SingleFacetPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.TopLinksPanel;
@@ -64 +65 @@
 
         // add an updatable container for breadcrumbs and top links
-        navigation = new WebMarkupContainer("navigation");
-        navigation.setOutputMarkupId(true);
+        navigation = createNavigation("navigation");
         add(navigation);
-
-        navigation.add(new BookmarkablePageLink("breadcrumb", getApplication().getHomePage()));
-        navigation.add(new TopLinksPanel("topLinks", null));
 
         // add a persistenet panel for selection of a value for the collection facet
@@ -88 +85 @@
         browse = new SimpleSearchBrowsePanel("browse", getModel());
         add(browse);
+    }
+
+    private WebMarkupContainer createNavigation(String id) {
+        final WebMarkupContainer container = new WebMarkupContainer(id);
+        container.setOutputMarkupId(true);
+        container.add(new BookmarkablePageLink("breadcrumb", getApplication().getHomePage()));
+        container.add(new TopLinksPanel("topLinks", new PermaLinkModel(getPageClass(), getModel())) {
+
+            @Override
+            protected void onChange(AjaxRequestTarget target) {
+                if (target != null) {
+                    target.add(container);
+                }
+            }
+
+        });
+        return container;
     }