prevent hidden filter values from being displayed

Author: litvinovg

webapp/src/main/webapp/templates/freemarker/body/menupage/browseSearchFilterValues.ftl

@@ -68,6 +68,52 @@
         <#assign selectedValue = "" >
         <#assign valueNumber = 1>
         <#list f.values?values as value>
+            <#if user.loggedIn || value.publiclyAvailable>
+                <#if value.selected>
+                    <#assign selectedValue = value.id >
+                </#if>
+                <#assign valueLabel = value.name >
+                <#if !(valueLabel?has_content)>
+                    <#assign valueLabel = value.id >
+                </#if>
+                <#if value.selected>
+                    <li id="${value.id?html}" class="li-selected">
+                        <a href="#" class="selected">
+                            <@sl.getInput f value sl.getValueID(f.id, valueNumber) valueNumber 'filter-form' />
+                            <@sl.getSelectedLabel sl.getValueID(filter.id, valueNumber)?html value f getCurrentCount(f value) />
+                        </a>
+                    </li>
+                <#else>
+                    <li id="${value.id?html}">
+                        <a href="#">
+                            <@sl.getInput f value sl.getValueID(f.id, valueNumber) valueNumber 'filter-form' />
+                            <@sl.getLabel sl.getValueID(f.id, valueNumber) value f getCurrentCount(f value) />
+                        </a>
+                    </li>
+                </#if>
+                <#assign valueNumber = valueNumber + 1>
+            </#if>
+        </#list>
+</#macro>
+
+<#function getCurrentCount f v>
+    <#if filters[f.id]??>
+        <#assign filter = filters[f.id]>
+        <#if filter.values[v.id]??>
+            <#return filter.values[v.id].count >
+        <#else>
+            <#return 0 />
+        </#if>
+    <#else>
+        <#return 0 />
+    </#if>
+</#function>
+
+<#macro filterFacets f>
+    <#assign selectedValue = "" >
+    <#assign valueNumber = 1>
+    <#list f.values?values as value>
+        <#if user.loggedIn || value.publiclyAvailable>
             <#if value.selected>
                 <#assign selectedValue = value.id >
             </#if>
@@ -79,7 +125,7 @@
                 <li id="${value.id?html}" class="li-selected">
                     <a href="#" class="selected">
                         <@sl.getInput f value sl.getValueID(f.id, valueNumber) valueNumber 'filter-form' />
-                        <@sl.getSelectedLabel sl.getValueID(filter.id, valueNumber)?html value f getCurrentCount(f value) />
+                        <@sl.getSelectedLabel sl.getValueID(f.id, valueNumber)?html value f getCurrentCount(f value) />
                     </a>
                 </li>
             <#else>
@@ -91,49 +137,7 @@
                 </li>
             </#if>
             <#assign valueNumber = valueNumber + 1>
-        </#list>
-</#macro>
-
-<#function getCurrentCount f v>
-    <#if filters[f.id]??>
-        <#assign filter = filters[f.id]>
-        <#if filter.values[v.id]??>
-            <#return filter.values[v.id].count >
-        <#else>
-            <#return 0 />
-        </#if>
-    <#else>
-        <#return 0 />
-    </#if>
-</#function>
-
-<#macro filterFacets f>
-    <#assign selectedValue = "" >
-    <#assign valueNumber = 1>
-    <#list f.values?values as value>
-        <#if value.selected>
-            <#assign selectedValue = value.id >
-        </#if>
-        <#assign valueLabel = value.name >
-        <#if !(valueLabel?has_content)>
-            <#assign valueLabel = value.id >
-        </#if>
-        <#if value.selected>
-            <li id="${value.id?html}" class="li-selected">
-                <a href="#" class="selected">
-                    <@sl.getInput f value sl.getValueID(f.id, valueNumber) valueNumber 'filter-form' />
-                    <@sl.getSelectedLabel sl.getValueID(f.id, valueNumber)?html value f getCurrentCount(f value) />
-                </a>
-            </li>
-        <#else>
-            <li id="${value.id?html}">
-                <a href="#">
-                    <@sl.getInput f value sl.getValueID(f.id, valueNumber) valueNumber 'filter-form' />
-                    <@sl.getLabel sl.getValueID(f.id, valueNumber) value f getCurrentCount(f value) />
-                </a>
-            </li>
         </#if>
-        <#assign valueNumber = valueNumber + 1>
     </#list>
 </#macro>