Merge pull request #7454 from bolt/hotfix/no-stack-in-recordbrowser

If stack is disabled, don't show it in recordbrowser popup
bolt · Apr 29, 2018 · b781c24 · b781c24
2 parents b28b491 + 4255628
commit b781c24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/view/twig/recordbrowser/_content.twig b/app/view/twig/recordbrowser/_content.twig
@@ -1,11 +1,15 @@
 <div class="tab-content">
 
+    {% if not config.get('general/backend/stack/disable', false) %}
     <div class="tab-pane active" id="stacktab">
         {{ render(path("stack/show", {'options': 'list'})) }}
     </div>
+    {% endif %}
 
     {% for contenttype, records in context.results %}
-        <div class="tab-pane" id="{{ contenttype }}">
+        <div class="tab-pane
+        {%- if loop.first and config.get('general/backend/stack/disable') %} active{% endif -%}
+        " id="{{ contenttype }}">
             <ul>
                 {% for record in records %}
                     <li><a class="filebrowserCallbackLink" href="{{ record.link }}" >№ {{ record.id }}. {{ record.title }}</a></li>

diff --git a/app/view/twig/recordbrowser/_navigation.twig b/app/view/twig/recordbrowser/_navigation.twig
@@ -1,13 +1,17 @@
 <ul class="nav nav-tabs" id="filtertabs">
 
+    {% if not config.get('general/backend/stack/disable', false) %}
     <li class="active">
         <a href="#stacktab" data-toggle="tab">
             {{ __('general.phrase.stack') }}
         </a>
     </li>
+    {% endif %}
 
     {% for contenttype, records in context.results %}
-        <li>
+        <li
+        {%- if loop.first and config.get('general/backend/stack/disable') %} class="active"{% endif -%}
+        >
             <a href="#{{ contenttype }}" data-toggle="tab">
                 {{ config.get('contenttypes')[ contenttype ].name }}
             </a>