Changeset 4880

Timestamp:

04/02/14 13:19:44 (11 years ago)

Author:

Twan Goosen

Message:

Resources are hidden in search results (both collapsed and expanded) unless there actually are resources

Location:

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

Files:

• SearchResultItemCollapsedPanel.html (modified) (1 diff)
• SearchResultItemCollapsedPanel.java (modified) (2 diffs)
• SearchResultItemExpandedPanel.html (modified) (1 diff)
• SearchResultItemExpandedPanel.java (modified) (5 diffs)

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

@@ -27 +27 @@
                 [DESCRIPTION]
             </p>
-            <div class="searchresultresources">
+            <div wicket:id="resources" class="searchresultresources">
                 Resources: 
                 <ul>

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

@@ -27 +27 @@
 import java.util.Locale;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
@@ -64 +65 @@
         // wrap with a count provider
         final ResouceTypeCountDataProvider countProvider = new ResouceTypeCountDataProvider(resourcesModel, countingService);
-        // view that shows provided counts 
-        // TODO: hide if no resources
-        add(new ResourceCountDataView("resourceCount", countProvider));
+
+        // add a container for the resource type counts (only visible if there are actual resources)
+        add(new WebMarkupContainer("resources") {
+            {
+                // view that shows provided counts
+                add(new ResourceCountDataView("resourceCount", countProvider));
+            }
+
+            @Override
+            protected void onConfigure() {
+                super.onConfigure();
+                setVisible(countProvider.size() > 0);
+            }
+        });
     }
 

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

@@ -30 +30 @@
                 <wicket:container wicket:id="documentProperties">[PROPERTIES TABLE]</wicket:container>
                 <p class="moredocumentproperties"><a wicket:id="recordLink">More</a></p>
-                <h3>Resources</h3>
-                <ul class="searchresultresources">
-                    <li wicket:id="resource">
-                        <a wicket:id="resourceLink" href="">
-                            <wicket:container wicket:id="resourceName"></wicket:container>
-                        </a>
-                    </li>
-                </ul>
+                <wicket:container wicket:id="resources">
+                    <h3>Resources</h3>
+                    <ul class="searchresultresources">
+                        <li wicket:id="resource">
+                            <a wicket:id="resourceLink" href="">
+                                <wicket:container wicket:id="resourceName"></wicket:container>
+                            </a>
+                        </li>
+                    </ul>
+                </wicket:container>
             </div>
         </wicket:panel>

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

@@ -31 +31 @@
 import java.util.List;
 import org.apache.solr.common.SolrDocument;
+import org.apache.wicket.Component;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
@@ -37 +39 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -63 +66 @@
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(documentModel, basicPropertiesFilter)));
 
-        createResourcesList("resource");
+        final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
+
+        // add a container for the resources (only visible if there are actual resources)
+        add(new WebMarkupContainer("resources") {
+            {
+                add(createResourcesList("resource", resourceModel));
+            }
+
+            @Override
+            protected void onConfigure() {
+                super.onConfigure();
+                setVisible(resourceModel.getObject() != null);
+            }
+
+        });
     }
 
-    private void createResourcesList(String id) {
+    private Component createResourcesList(String id, SolrFieldModel<String> resourceModel) {
         // list of resources in this record
         // TODO: limit number of resources shown here?
-        final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
         final IModel<List<String>> resourceListModel = new CollectionListModel<String>(resourceModel);
-        add(new ListView<String>(id, resourceListModel) {
+        return new ListView<String>(id, resourceListModel) {
 
             @Override
@@ -84 +100 @@
                 // add a tooltip showing resource type and mime type
                 final StringResourceModel tooltipModel
-                        = new StringResourceModel("resource.tooltip", SearchResultItemExpandedPanel.this, resourceModel,
+                        = new StringResourceModel("resource.tooltip", SearchResultItemExpandedPanel.this, null,
                                 new Object[]{
                                     new PropertyModel(resourceInfoModel, "resourceType"),
@@ -96 +112 @@
                 item.add(resourceLink);
             }
-        });
+        };
     }