Added multi select list to allow state filtering

clarin-eric · Apr 5, 2016 · e8d60f0 · e8d60f0
1 parent 63c6e2f
commit e8d60f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/...va/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java b/...va/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java
@@ -74,8 +74,6 @@ protected void onClick(AjaxRequestTarget target,
                                     doEdit(target, model.getObject());
                                 }
                             };
-            //Hide the edit option if the vc is frozen
-            editItem.setVisible(model.getObject().getState() != VirtualCollection.State.PUBLIC_FROZEN);
             menu.add(editItem);
 
             final AjaxLinkMenuItem<VirtualCollection> deleteItem
@@ -110,6 +108,9 @@ protected void onClick(AjaxRequestTarget target,
                 publishItem.setVisible(false).setEnabled(false);
                 deleteItem.setVisible(false).setEnabled(false);
             }
+            if(model.getObject().getState() == VirtualCollection.State.PUBLIC_FROZEN) {
+                editItem.setVisible(false).setEnabled(false);
+            }
         }
     }
 
@@ -164,6 +165,9 @@ public void onClick(AjaxRequestTarget target) {
                 publishLink.setVisible(false).setEnabled(false);
                 deleteLink.setVisible(false).setEnabled(false);
             }
+            if(vc.getState() == VirtualCollection.State.PUBLIC_FROZEN) {
+                editLink.setVisible(false).setEnabled(false);
+            }
             boolean isVisible = detailsLink.isVisible()
                     || editLink.isVisible() || publishLink.isVisible()
                     || deleteLink.isVisible();

diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.html b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.html
@@ -19,12 +19,12 @@
       <input wicket:id="description" type="text" class="desc"
              size="64" maxlength="255"/>
     </div>
-       <!--
+
     <div wicket:id="state" class="optional">
       <label>State</label>
       <select wicket:id="state"></select>
     </div>
-       -->
+
     <div class="optional">
       <label>Type</label>
       <select wicket:id="type"></select>

diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java
@@ -21,13 +21,16 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.QueryOptions;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import org.apache.wicket.markup.html.form.ListMultipleChoice;
 
 @SuppressWarnings("serial")
 public class FilterForm extends Panel {
     private static final List<FilterState.SearchMode> MODE_VALUES =
         Arrays.asList(FilterState.SearchMode.values());
     private static final List<VirtualCollection.State> STATE_VALUES =
-        Arrays.asList(VirtualCollection.State.PUBLIC,
+        Arrays.asList(
+                VirtualCollection.State.PUBLIC,
+                VirtualCollection.State.PUBLIC_FROZEN,
                 VirtualCollection.State.PRIVATE,
                 VirtualCollection.State.DELETED,
                 VirtualCollection.State.PUBLIC_PENDING,
@@ -61,12 +64,12 @@ public FilterForm(String id, IFilterStateLocator<FilterState> locator,
                 MODE_VALUES, searchModeRenderer));
         form.add(new TextField<String>("description")
                 .add(new StringValidator.MaximumLengthValidator(255)));
-        //final WebMarkupContainer state = new WebMarkupContainer("state");
-        //state.add(new DropDownChoice<VirtualCollection.State>("state",
-        //        STATE_VALUES,
-        //        new EnumChoiceRenderer<VirtualCollection.State>(this)));
-        //state.setVisible(privateMode);
-        //form.add(state);
+
+        final WebMarkupContainer state = new WebMarkupContainer("state");
+        state.add(new ListMultipleChoice("state", STATE_VALUES));
+        state.setVisible(privateMode);
+        form.add(state);
+
         form.add(new DropDownChoice<VirtualCollection.Type>("type",
                 TYPE_VALUES,
                 new EnumChoiceRenderer<VirtualCollection.Type>(this)));