Changeset 5032

Timestamp:

04/24/14 09:03:13 (10 years ago)

Author:

Twan Goosen

Message:

fixed ignoring of collection selection on 'browse all' in simple search page

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• pages/SimpleSearchPage.java (modified) (3 diffs)
• panels/search/SimpleSearchBrowsePanel.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
@@ -43 +42 @@
     @SpringBean
     private FacetFieldsService facetFieldsService;
-    @SpringBean(name = "queryParametersConverter")
-    private PageParametersConverter<QueryFacetsSelection> paramsConverter;
 
     private final SingleFacetPanel collectionsPanel;
@@ -89 +86 @@
             @Override
             protected void onSubmit(AjaxRequestTarget target) {
-                setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(model.getObject()));
+                setResponsePage(new FacetedSearchPage(model));
             }
         });

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java

@@ -32 +32 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -72 +72 @@
 
         // add a link to browse all records
-        final BookmarkablePageLink browseAllLink = new BookmarkablePageLink("browseAll", FacetedSearchPage.class);
+        final Link browseAllLink = new Link("browseAll") {
+
+            @Override
+            public void onClick() {
+                setResponsePage(new FacetedSearchPage(SimpleSearchBrowsePanel.this.getModel()));
+            }
+        };
         // set label on basis of string defined in resource bundle that takes the count model as a parameter
         browseAllLink.add(new Label("recordCount", new StringResourceModel("simplesearch.allrecords", documentCountModel, new Object[]{})));