From 0abb274ffde29299a4a54a4b94ecb84d8b8ffb2a Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Wed, 12 Dec 2018 14:28:11 +0200
Subject: [PATCH] Fix concept group display also in search result list. Related
 to #811

---
 view/search-result.twig | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/view/search-result.twig b/view/search-result.twig
index aaa81179b..640928140 100644
--- a/view/search-result.twig
+++ b/view/search-result.twig
@@ -66,19 +66,14 @@
         <img class="property-hover" src="resource/pics/group.gif">
       </span>
       <div class="property-values">
-      {% set previous = false %}
-      {% for propval in concept.groupProperties %} {# loop through ConceptPropertyValue objects #}
-        {% set outerLast = loop.last %}
-        {% if propval.uri and propval.type != 'skosmos:memberOfArray'%} {# resources with URI #}
-          {% spaceless %}
-            {% if propval.label %}
-              <span class="versal value">{{ propval.label(request.contentLang) }}</span>
-              {% if propval.lang and (propval.lang != request.lang) or explicit_langcodes %}<span class="versal"> ({{ propval.lang }})</span>{% endif %}
-              {% if propval.type == 'skosmos:memberOfSuper' %}<span class="versal"> > </span> {% elseif not loop.last %},{% endif %}
-            {% endif %}
-          {% endspaceless %}
-        {% endif %}
-      {% endfor %}
+        {% for groupprop in concept.groupProperties %}
+          {% for propval in groupprop %}
+            <span class="versal value">{{ propval.label(request.contentLang) }}</span>
+            {% if propval.lang and (propval.lang != request.lang) or explicit_langcodes %}<span class="versal"> ({{ propval.lang }})</span>{% endif %}
+            {% if not loop.last %}<span class="versal"> &#62; </span>{% endif %}
+          {% endfor %}
+          {%- if not loop.last %},{% endif %}
+        {% endfor %}
       </div>
     </div>
   {% endif %}