Changeset 5023

Timestamp:

04/23/14 07:24:01 (10 years ago)

Author:

Twan Goosen

Message:

Made advanced options panel initially expanded if FCS options is already selected on construction

Location:

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

Files:

• ExpandablePanel.java (modified) (2 diffs)
• search/AdvancedSearchOptionsPanel.java (modified) (2 diffs)

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

@@ -135 +135 @@
     }
 
-    protected abstract Label createTitleLabel(String id);
-
     @Override
     public void detachModels() {
@@ -142 +140 @@
         expansionModel.detach();
     }
+
+    public final IModel<ExpansionState> getExpansionModel() {
+        return expansionModel;
+    }
+
+    protected abstract Label createTitleLabel(String id);
 
     /**

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.FacetSelectionType;
@@ -61 +62 @@
         options.add(fcsCheck);
         add(options);
+
+        // should initially be epxanded if one of the options was selected
+        if (toggleModel.getObject()) {
+            getExpansionModel().setObject(ExpansionState.EXPANDED);
+        }
     }