Changeset 4961

Timestamp:

04/14/14 07:29:20 (10 years ago)

Author:

Twan Goosen

Message:

apply minimal occurence selection after change (automatically check checkbox)

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java (modified) (11 diffs)

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

@@ -56 +56 @@
  */
 public abstract class AllFacetValuesPanel extends GenericPanel<FacetField> {
-
+    
     private final FacetFieldValuesProvider valuesProvider;
     private final WebMarkupContainer valuesContainer;
@@ -78 +78 @@
     public AllFacetValuesPanel(String id, IModel<FacetField> model, IModel<FieldValuesFilter> filterModel) {
         super(id, model);
-
+        
         if (filterModel != null) {
             this.filterModel = filterModel;
@@ -87 +87 @@
         // create a provider that shows all values and is sorted by name by default
         valuesProvider = new FacetFieldValuesProvider(model, Integer.MAX_VALUE, FieldValueOrderSelector.NAME_SORT) {
-
+            
             @Override
             protected IModel<FieldValuesFilter> getFilterModel() {
@@ -93 +93 @@
                 return AllFacetValuesPanel.this.filterModel;
             }
-
+            
         };
 
@@ -110 +110 @@
         add(optionsForm);
     }
-
+    
     private DataView<FacetField.Count> createValuesView(String id) {
         return new DataView<FacetField.Count>(id, valuesProvider) {
-
+            
             @Override
             protected void populateItem(final Item<FacetField.Count> item) {
@@ -120 +120 @@
                 // link to select an individual facet value
                 final Link selectLink = new AjaxFallbackLink("facetSelect") {
-
+                    
                     @Override
                     public void onClick(AjaxRequestTarget target) {
@@ -141 +141 @@
         };
     }
-
+    
     private Form createOptionsForm(String id) {
         final Form options = new Form(id);
-
+        
         final DropDownChoice<SortParam<FieldValuesOrder>> sortSelect
                 = new FieldValueOrderSelector("sort", new PropertyModel<SortParam<FieldValuesOrder>>(valuesProvider, "sort"));
         sortSelect.add(new UpdateOptionsFormBehavior(options));
         options.add(sortSelect);
-
+        
         final TextField filterField = new TextField<String>("filter", new PropertyModel(filterModel, "name"));
         filterField.add(new AjaxFormComponentUpdatingBehavior("keyup") {
-
+            
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -159 +159 @@
         });
         options.add(filterField);
-
+        
         addOccurenceOptions(options);
-
+        
         return options;
     }
@@ -197 +197 @@
         // Dropdown to select a value (which is applied to the filter if the 'bridge' is open)
         final DropDownChoice<Integer> minOccurence = new DropDownChoice<Integer>("minOccurences", minOccurenceSelectModel, ImmutableList.of(2, 5, 10, 100, 1000));
-        minOccurence.add(new UpdateOptionsFormBehavior(options));
+        minOccurence.add(new UpdateOptionsFormBehavior(options) {
+            
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                super.onUpdate(target);
+                // on change, apply to inner model ('open bridge')
+                if (!minOccurenceCheckBoxModel.getObject()) {
+                    minOccurenceCheckBoxModel.setObject(true);
+                }
+            }
+            
+        });
         options.add(minOccurence);
     }
-
+    
     private class UpdateOptionsFormBehavior extends OnChangeAjaxBehavior {
-
+        
         private final Form options;
-
+        
         public UpdateOptionsFormBehavior(Form options) {
             this.options = options;
         }
-
+        
         @Override
         protected void onUpdate(AjaxRequestTarget target) {
@@ -214 +225 @@
             target.add(valuesContainer);
         }
-
-    }
-
+        
+    }
+    
     @Override
     public void detachModels() {
@@ -232 +243 @@
      */
     protected abstract void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target);
-
+    
 }