Commits

Stephen McDonald committed c6a5f5d Draft

Restore delete/rename for popups that function correctly with these included.

  • Participants
  • Parent commits f9f9a26

Comments (0)

Files changed (2)

filebrowser_safe/templates/filebrowser/include/filelisting.html

     {% endifequal %}
 
     <!-- RENAME -->
-    {% if not query.pop %}
+    {% if query.pop != '4' %}
     <td class="fb_icon"><a href="{% url "fb_rename" %}{% query_string %}&amp;filename={{ file.filename }}" class="fb_renamelink" title="{% trans 'Rename' %}"></a></td>
     {% endif %}
 
     <td>{{ file.datetime|date:"N j, Y" }}</td>
 
     <!-- DELETE -->
-    {% if not query.pop %}
+    {% if query.pop != '4' %}
     <td class="fb_icon">
         {% ifnotequal file.filetype 'Folder' %}
         <form method="POST" action="{% url "fb_delete" %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" id="delete-{{ forloop.counter0 }}">{% csrf_token %}</form>

filebrowser_safe/templates/filebrowser/include/tableheader.html

     {% ifequal query.o 'filename_lower' %}<th class="sorted {{ query.ot }}ending"><a href="{% query_string "" "o,ot,p" %}&amp;ot={% ifequal query.ot 'desc' %}asc{% else %}desc{% endifequal %}&amp;o=filename_lower">{% trans 'Filename' %}</a></th>{% endifequal %}
     {% ifnotequal query.o 'filename_lower' %}<th><a href="{% query_string "" "o,ot,p" %}&amp;ot=asc&amp;o=filename_lower">{% trans 'Filename' %}</a></th>{% endifnotequal %}
     <!-- RENAME -->
-    {% if not query.pop %}
+    {% if query.pop != '4' %}
     <th>&nbsp;</th>
     {% endif %}
     <!-- SIZE -->
     {% ifequal query.o 'date' %}<th class="sorted {{ query.ot }}ending"><a href="{% query_string "" "o,ot,p" %}&amp;ot={% ifequal query.ot 'desc' %}asc{% else %}desc{% endifequal %}&amp;o=date">{% trans 'Date' %}</a></th>{% endifequal %}
     {% ifnotequal query.o 'date' %}<th><a href="{% query_string "" "o,ot,p" %}&amp;ot=asc&amp;o=date">{% trans 'Date' %}</a></th>{% endifnotequal %}
     <!-- DELETE -->
-    {% if not query.pop %}
+    {% if query.pop != '4' %}
     <th>&nbsp;</th>
     {% endif %}
     {% if settings_var.DEBUG %}<th>Debug</th>{% endif %}