Changeset 5199

Timestamp:

05/14/14 15:31:45 (10 years ago)

Author:

Twan Goosen

Message:

Null fallback for record name in record page title model. Fixes #556

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages

Files:

• RecordPage.java (modified) (4 diffs)
• RecordPage.properties (modified) (1 diff)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -27 +27 @@
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
+import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.SearchContextModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
@@ -70 +71 @@
 
     private final static ResourceReference CMDI_HTML_CSS = new CssResourceReference(RecordPage.class, "cmdi.css");
-    
+
     @SpringBean(name = "documentParamsConverter")
     private PageParametersConverter<SolrDocument> documentParamConverter;
@@ -139 +140 @@
 
         // General information section
-        add(new SolrFieldLabel("name", getModel(), FacetConstants.FIELD_NAME, "Unnamed record"));
+        add(new SolrFieldLabel("name", getModel(), FacetConstants.FIELD_NAME, getString("recordpage.unnamedrecord")));
         add(createLandingPageLink("landingPageLink"));
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(getModel(), basicPropertiesFilter, fieldOrder)));
@@ -282 +283 @@
         // Put the name of the record in the page title
         return new StringResourceModel("recordpage.title",
-                new SolrFieldStringModel(getModel(), FacetConstants.FIELD_NAME),
+                new NullFallbackModel(new SolrFieldStringModel(getModel(), FacetConstants.FIELD_NAME), getString("recordpage.unnamedrecord")),
                 DEFAULT_PAGE_TITLE);
     }

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.properties

@@ -16 +16 @@
 # ${} = value of 'name' field of record
 recordpage.title=CLARIN VLO - ${}
+recordpage.unnamedrecord=Unnamed record