Changeset 5464

Timestamp:

07/09/14 09:02:12 (10 years ago)

Author:

Twan Goosen

Message:

Replaced VC submission form panel with a page. Advanced options panel opens the page in a new tab. No auto submission and option to enter a custom collection title.

Location:

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

Files:

• pages/VirtualCollectionSubmissionPage.html (added)
• pages/VirtualCollectionSubmissionPage.java (added)
• panels/VirtualCollectionFormPanel.html (deleted)
• panels/VirtualCollectionFormPanel.java (deleted)
• panels/search/AdvancedSearchOptionsPanel.html (modified) (1 diff)
• panels/search/AdvancedSearchOptionsPanel.java (modified) (5 diffs)

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

@@ -34 +34 @@
                     <input type="submit" value="Apply" class="nonjsfallback" />
                 </form>
-                <div wicket:id="vcrSubmit" id="vcrsubmit">
-                    <a wicket:id="vcrSubmitTrigger">Create virtual collection from search results</a>
-                    <div wicket:id="vcrForm">
-                        [VCR submit form]
-                    </div>
-                </div>
+                <a wicket:id="vcrSubmitTrigger" target="_blank">Create virtual collection from search results</a>
             </div>
         </wicket:extend>

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

@@ -24 +24 @@
 import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
 import eu.clarin.cmdi.vlo.wicket.model.ToggleModel;
+import eu.clarin.cmdi.vlo.wicket.pages.VirtualCollectionSubmissionPage;
 import eu.clarin.cmdi.vlo.wicket.panels.ExpandablePanel;
-import eu.clarin.cmdi.vlo.wicket.panels.VirtualCollectionFormPanel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.IModel;
 
@@ -45 +44 @@
  */
 public abstract class AdvancedSearchOptionsPanel extends ExpandablePanel<QueryFacetsSelection> {
-    
-    public AdvancedSearchOptionsPanel(String id, IModel<QueryFacetsSelection> model) {
+
+    public AdvancedSearchOptionsPanel(String id, final IModel<QueryFacetsSelection> model) {
         super(id, model);
 
@@ -53 +52 @@
         // wrap in a toggle model that allows switching between a null selection and a 'not empty' selection
         final ToggleModel<FacetSelection> toggleModel = new ToggleModel<FacetSelection>(fcsFacetModel, null, new FacetSelection(FacetSelectionType.NOT_EMPTY));
-        
+
         final Form options = new Form("options");
         final CheckBox fcsCheck = new CheckBox("fcs", toggleModel);
         fcsCheck.add(new OnChangeAjaxBehavior() {
-            
+
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -65 +64 @@
         options.add(fcsCheck);
         add(options);
-        
-        final WebMarkupContainer vcrSubmit = new WebMarkupContainer("vcrSubmit");
-        vcrSubmit.setOutputMarkupId(true);
-        add(vcrSubmit);
-        
-        final VirtualCollectionFormPanel vcrSubmitForm = new VirtualCollectionFormPanel("vcrForm", model);
-        vcrSubmitForm.setVisible(false);
-        vcrSubmit.add(vcrSubmitForm);
-        
-        vcrSubmit.add(new AjaxFallbackLink("vcrSubmitTrigger") {
-            
+
+        add(new Link("vcrSubmitTrigger") {
+
             @Override
-            public void onClick(AjaxRequestTarget target) {
-                vcrSubmitForm.setVisible(true);
-                if (target != null) {
-                    target.add(vcrSubmit);
-                    // after update, submit the form to the VCR
-                    target.appendJavaScript("document.vcrForm.submit();");
-                }
+            public void onClick() {
+                setResponsePage(new VirtualCollectionSubmissionPage(model));
             }
         });
@@ -92 +78 @@
         }
     }
-    
+
     @Override
     protected Label createTitleLabel(String id) {
         return new Label(id, "Search options");
     }
-    
+
     protected abstract void selectionChanged(AjaxRequestTarget target);
-    
+
 }