Merge branch 'release/3.2.2.20'

openlabs · Feb 19, 2015 · 29e026a · 29e026a
2 parents 79796c4 + 533c943
commit 29e026a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/setup.py b/setup.py
@@ -144,11 +144,11 @@ def run(self):
         'trytond.modules.nereid_webshop.tests': 'tests',
     },
     package_data={
-        'trytond.modules.nereid_webshop': info.get('xml', [])
-        + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']
-        + ['i18n/*.pot', 'i18n/pt_BR/LC_MESSAGES/*', 'view/*.xml']
-        + list(get_files("templates/"))
-        + list(get_files("static/")),
+        'trytond.modules.nereid_webshop': info.get('xml', []) +
+        ['tryton.cfg', 'locale/*.po', 'tests/*.rst'] +
+        ['i18n/*.pot', 'i18n/pt_BR/LC_MESSAGES/*', 'view/*.xml'] +
+        list(get_files("templates/")) +
+        list(get_files("static/")),
     },
     license='GPL-3',
     install_requires=requires,

diff --git a/templates/webshop/search-results.jinja b/templates/webshop/search-results.jinja
@@ -19,30 +19,32 @@
           <input type="hidden" name="q" value="{{ request.args.get('q') }}" />
           <input type="hidden" name="page" value="1"/>
           {% for key, value in facets.iteritems() %}
-            <div class="row facet-attr">
-              {% set facet_checked = request.args.getlist(key) %}
-                <ul class="list-unstyled">
-                  <li class="text-capitalize list-heading"><strong>{{ key }}</strong></li>
-                  {% for term in value['terms'][:facet_show_limit] %}
-                    <li>{{ render_search_filter_field(term, facet_checked, key) }}</li>
-                  {% endfor %}
-                </ul>
-                <ul class="list-unstyled show-on-more">
-                  {% for term in value['terms'][facet_show_limit:] %}
-                    <li>{{ render_search_filter_field(term, facet_checked, key) }}</li>
-                  {% endfor %}
-                </ul>
-              {% if value['terms']|length > facet_show_limit %}
-                <div class="more btn btn-default btn-sm toggle-show-more">
-                  <span class="hide-on-more">
-                    +{{ (value['terms'] | length) - facet_show_limit }} {% trans %}More{% endtrans %}
-                  </span>
-                  <span class="show-on-more">
-                    {% trans %}Show less{% endtrans %}
-                  </span>
-                </div>
-              {% endif %}
-            </div>
+            {% if value['total'] %}
+              <div class="row facet-attr">
+                {% set facet_checked = request.args.getlist(key) %}
+                  <ul class="list-unstyled">
+                    <li class="text-capitalize list-heading"><strong>{{ key }}</strong></li>
+                    {% for term in value['terms'][:facet_show_limit] %}
+                      <li>{{ render_search_filter_field(term, facet_checked, key) }}</li>
+                    {% endfor %}
+                  </ul>
+                  <ul class="list-unstyled show-on-more">
+                    {% for term in value['terms'][facet_show_limit:] %}
+                      <li>{{ render_search_filter_field(term, facet_checked, key) }}</li>
+                    {% endfor %}
+                  </ul>
+                {% if value['terms']|length > facet_show_limit %}
+                  <div class="more btn btn-default btn-sm toggle-show-more">
+                    <span class="hide-on-more">
+                      +{{ (value['terms'] | length) - facet_show_limit }} {% trans %}More{% endtrans %}
+                    </span>
+                    <span class="show-on-more">
+                      {% trans %}Show less{% endtrans %}
+                    </span>
+                  </div>
+                {% endif %}
+              </div>
+            {% endif %}
           {% endfor %}
           <br>
           <a href="{{ url_for('nereid.website.quick_search', q=request.args.get('q', '')) }}" class="btn btn-block btn-default">{% trans %}Clear Filters{% endtrans %}</a>

diff --git a/tryton.cfg b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.2.19
+version=3.2.2.20
 depends:
     nereid
     nereid_cms