Merge pull request #761 from divio/bugfix/missing-popup-parameter

adds missing popup parameter on folder edit and delete links
django-cms · Mar 4, 2016 · a363d1d · a363d1d
2 parents 369afb2 + 813e792
commit a363d1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/filer/templates/admin/filer/folder/directory_table.html b/filer/templates/admin/filer/folder/directory_table.html
@@ -62,8 +62,8 @@
                             </td>
                             <td class="column-action">
                                 {% if subfolder.file_type == "Folder" %}
-                                    <a href="{% url 'admin:filer_folder_change' subfolder.id %}" title="{% trans 'Change folder details' %}" class="icon fa fa-pencil"></a>
-                                    <a href="{{ subfolder.get_admin_delete_url }}" class="icon fa fa-trash-o" title="{% trans 'Remove folder' %}"></a>
+                                    <a href="{% url 'admin:filer_folder_change' subfolder.id %}{% if is_popup %}?_popup=1{% if select_folder %}&amp;select_folder=1{% endif %}{% endif %}" title="{% trans 'Change folder details' %}" class="icon fa fa-pencil"></a>
+                                    <a href="{{ subfolder.get_admin_delete_url }}{% if is_popup %}?_popup=1{% if select_folder %}&amp;select_folder=1{% endif %}{% endif %}" class="icon fa fa-trash-o" title="{% trans 'Remove folder' %}"></a>
                                 {% endif %}
                             </td>
                         </tr>