Merge pull request #335 from woutervandamme/bugfix/media_chooser

[MediaBundle] Media chooser type parameter now filters results correctly
Kunstmaan · Apr 16, 2015 · 034c8ea · 034c8ea
2 parents 763388d + 99511d0
commit 034c8ea
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig b/src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig
@@ -187,18 +187,20 @@
         {% else %}
             {% if adminlist.count > 0 %}
                 <div class="row">
+                    {% set counter = 1 %}
                     {% for media in folder.media %}
-                        {% set handler = mediamanager.getHandler(media) %}
-                        {% set imageurl =  handler.getImageUrl(media, app.request.basePath) %}
-                        {% if imageurl is not empty and media.location == 'local' %}
-                            {% if imageurl|lower|split('.')|last == 'svg' or 'image/svg' in media.contentType %}
-                                {% set imageurl = imageurl %}
-                            {% else %}
-                                {% set imageurl = imageurl | imagine_filter('media_list_thumbnail') %}
+                        {% if not handler or handler.canHandle(media) %}
+                            {% set handler = mediamanager.getHandler(media) %}
+                            {% set imageurl =  handler.getImageUrl(media, app.request.basePath) %}
+                            {% if imageurl is not empty and media.location == 'local' %}
+                                {% if imageurl|lower|split('.')|last == 'svg' or 'image/svg' in media.contentType %}
+                                    {% set imageurl = imageurl %}
+                                {% else %}
+                                    {% set imageurl = imageurl | imagine_filter('media_list_thumbnail') %}
+                                {% endif %}
                             {% endif %}
-                        {% endif %}
 
-                        {% if not handler or handler.canHandle(media) %}
+
                             <div class="col-sm-6 col-md-4 col-lg-3">
                                 <a href="javascript:void(0)" class="js-url-chooser-media-select thumbnail media-thumbnail" data-thumb-path="{{ imageurl }}" data-path="{{ media.url }}" data-title="{{ media.name|escape('js') }}" data-id="{{ media.id }}" data-cke="{% if cKEditorFuncNum %}true{% else %}false{% endif %}">
                                     <figure>
@@ -218,15 +220,17 @@
                             </div>
 
                             {# Clearfixes #}
-                            {% if loop.index is divisible by(2) %}
+                            {% if counter is divisible by(2) %}
                                 <div class="clearfix visible-sm-block"></div>
                             {% endif %}
-                            {% if loop.index is divisible by(3) %}
+                            {% if counter is divisible by(3) %}
                                 <div class="clearfix visible-md-block"></div>
                             {% endif %}
-                            {% if loop.index is divisible by(4) %}
+                            {% if counter is divisible by(4) %}
                                 <div class="clearfix visible-lg-block"></div>
                             {% endif %}
+
+                            {% set counter = counter+1 %}
                         {% endif %}
                     {% endfor %}
                 </div>