Explorar el Código

imprv/121 Add option for recursive delete completely from trash

ttaka66 hace 8 años
padre
commit
1161e37666
Se han modificado 2 ficheros con 10 adiciones y 14 borrados
  1. 9 4
      lib/views/modal/delete.html
  2. 1 10
      lib/views/page.html

+ 9 - 4
lib/views/modal/delete.html

@@ -23,10 +23,15 @@
           <label class="checkbox-inline text-danger">
             <input type="checkbox" name="recursively" checked>recursively
           </label>
-          <label class="checkbox-inline text-danger">
-            <input type="checkbox" name="completely">completely
-          </label>
-          <button type="submit" class="btn btn-danger delete-button">Delete</button>
+          {% if page.isDeleted() %}
+            <input type="hidden" name="completely" value="true">
+            <button type="submit" class="btn btn-danger delete-button"><i class="fa fa-times-circle" aria-hidden="true"></i> Delete Completely</button>
+          {% else %}
+            <label class="checkbox-inline text-danger">
+              <input type="checkbox" name="completely">completely
+            </label>
+            <button type="submit" class="btn btn-danger delete-button">Delete</button>
+          {% endif %}
         </div>
 
       </form>

+ 1 - 10
lib/views/page.html

@@ -86,16 +86,7 @@
           <a href="#" class="btn btn-default btn-sm" data-target="#putBackPage" data-toggle="modal"><i class="fa fa-undo" aria-hidden="true"></i> Put Back</a>
         </li>
         <li>
-          <form role="form" id="delete-page-form" onsubmit="return false;">
-            <input type="hidden" name="_csrf" value="{{ csrf() }}">
-            <input type="hidden" name="path" value="{{ page.path }}">
-            <input type="hidden" name="page_id" value="{{ page._id.toString() }}">
-            <input type="hidden" name="completely" value="true">
-            <button type="submit" class="btn btn-danger btn-sm">
-              <i class="fa fa-times-circle" aria-hidden="true"></i>
-              Delete Completely
-            </button>
-          </form>
+          <a href="#" class="btn btn-danger btn-sm" data-target="#deletePage" data-toggle="modal"><i class="fa fa-times-circle" aria-hidden="true"></i> Delete Completely</a>
         </li>
       </ul>{# /.pull-right #}
       {% endif %}