documents: remove organisation tag

Remove the document organisation tag from the public interface on the brief and detailed view if the display is not on the global view. * Closes rero#726. Co-Authored-by: Bertrand Zuchuat <[email protected]>
Garfield-fr · Feb 16, 2022 · 29a5f3e · 29a5f3e
1 parent 7eebf8e
commit 29a5f3e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/sonar/modules/documents/templates/documents/record.html b/sonar/modules/documents/templates/documents/record.html
@@ -67,18 +67,26 @@ <h5 class="my-4">{{ _('document_type_' + record.documentType) }}</h5>
     </div>
     <div class="col">
       <h1 class="text-primary">{{ title | nl2br | safe }}</h1>
+      {% set infoOrgSub = true %}
+      {%- if view != config.SONAR_APP_DEFAULT_ORGANISATION %}
+        {% set infoOrgSub = false if record.get('subdivisions', [])|length == 0 else true %}
+      {%- endif %}
+      {%- if infoOrgSub %}
       <h4 class="m-0">
-        {%- for organisation in record.get('organisation', []) -%}
-        <span class="badge badge-secondary text-light mr-1 font-weight-normal">
-          {{ organisation.name }}
-        </span>
-        {%- endfor -%}
+        {%- if view == config.SONAR_APP_DEFAULT_ORGANISATION %}
+          {%- for organisation in record.get('organisation', []) -%}
+          <span class="badge badge-secondary text-light mr-1 font-weight-normal">
+            {{ organisation.name }}
+          </span>
+          {%- endfor -%}
+        {%- endif %}
         {%- for subdivision in record.get('subdivisions', []) -%}
         <span class="badge badge-secondary text-light mr-1 font-weight-normal">
           {{ subdivision.name | language_value }}
         </span>
         {%- endfor -%}
       </h4>
+      {%- endif %}
 
       <!-- CONTRIBUTORS-->
       {% set contributors = record | contributors %}

diff --git a/sonar/modules/documents/views.py b/sonar/modules/documents/views.py
@@ -56,7 +56,8 @@ def search(view):
         collection = CollectionRecord.get_record_by_pid(
             request.args['collection_view'])
 
-    return render_template('sonar/search.html', collection=collection)
+    return render_template('sonar/search.html',
+                           collection=collection, view=view)
 
 
 def detail(pid, record, template=None, **kwargs):
@@ -107,6 +108,7 @@ def detail(pid, record, template=None, **kwargs):
     return render_template(template,
                            pid=pid,
                            record=record,
+                           view=kwargs.get('view'),
                            schema_org_data=schema_org_data,
                            google_scholar_data=google_scholar_data)
 

diff --git a/sonar/theme/templates/sonar/page.html b/sonar/theme/templates/sonar/page.html
@@ -21,7 +21,10 @@
 
 <!DOCTYPE html>
 <html {% if html_css_classes %} class="{{ html_css_classes|join(' ') }}" {% endif %}
-  lang="{{ current_i18n.locale.language|safe }}" dir="{{ current_i18n.locale.text_direction }}">
+  lang="{{ current_i18n.locale.language|safe }}" dir="{{ current_i18n.locale.text_direction }}"
+  {%- block view %}{%- endblock %}
+>
+
 
 <head>
   {% include config.THEME_TRACKINGCODE_TEMPLATE %}

diff --git a/sonar/theme/templates/sonar/search.html b/sonar/theme/templates/sonar/search.html
@@ -1,5 +1,6 @@
 {% extends 'sonar/page.html' %}
 
+{%- block view %} data-view="{{ view }}"{%- endblock %}
 {%- block body %}
 {% if collection %}
 {% include 'collections/item.html' %}