add remove button to trash page

lib/models/page.js

@@ -917,9 +917,11 @@ module.exports = function(crowi) {
         return Revision.removeRevisionsByPath(pageData.path);
       }).then(function(done) {
         return Page.removePageById(pageId);
+      }).then(function(done) {
+        return Page.removeRedirectOriginPageByPath(pageData.path);
       }).then(function(done) {
         pageEvent.emit('delete', pageData, user); // update as renamed page
-        resolve();
+        resolve(pageData);
       }).catch(reject);
     });
   };

lib/routes/page.js

@@ -759,15 +759,15 @@ module.exports = function(crowi, app) {
     .then(function(pageData) {
       debug('Delete page', pageData._id, pageData.path);
 
-      if (!pageData.isUpdatable(previousRevision)) {
-        throw new Error('Someone could update this page, so couldn\'t delete.');
-      }
-
       if (isCompletely) {
-        return Page.completelyDeletePage(pageData, req.user)
-          .then(() => pageData);
+        return Page.completelyDeletePage(pageData, req.user);
       }
+
       // else
+
+      if (!pageData.isUpdatable(previousRevision)) {
+        throw new Error('Someone could update this page, so couldn\'t delete.');
+      }
       return Page.deletePage(pageData, req.user);
     }).then(function(data) {
       debug('Page deleted', data.path);

lib/views/page.html

@@ -83,12 +83,25 @@
 
   {% if page.isDeleted() %}
   <div class="alert alert-danger">
-    <form role="form" class="pull-right" id="revert-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="submit" class="btn btn-danger btn-inverse btn-sm" value="Put Back!">
-    </form>
+    <ul class="list-inline pull-right">
+      <li>
+        <form role="form" id="revert-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="submit" class="btn btn-success btn-sm" value="Put Back">
+        </form>
+      </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">
+          <input type="submit" class="btn btn-danger btn-sm" value="Delete Completely">
+        </form>
+      </li>
+    </ul>{# /.pull-right #}
     <p>
       <i class="fa fa-trash-o" aria-hidden="true"></i>
       This page is in the trash.<br>