Feature - deletion of draft

hasjob/models/__init__.py

@@ -24,9 +24,10 @@ class POSTSTATUS:
     MODERATED = 8     # Moderated, needs edit
     ANNOUNCEMENT = 9  # Special announcement
     CLOSED = 10       # Not accepting applications, but publicly viewable
+    DELETED = 11      # For posts that are actually deleted, like in case of drafts
 
     UNPUBLISHED = (DRAFT, PENDING)
-    GONE = (REJECTED, WITHDRAWN, SPAM)
+    GONE = (REJECTED, WITHDRAWN, SPAM, DELETED)
     LISTED = (CONFIRMED, REVIEWED, ANNOUNCEMENT)
     POSTPENDING = (CONFIRMED, REVIEWED, REJECTED, WITHDRAWN, FLAGGED, SPAM, MODERATED, ANNOUNCEMENT)
     MY = (DRAFT, PENDING, CONFIRMED, REVIEWED, MODERATED, ANNOUNCEMENT, CLOSED)

hasjob/models/jobpost.py

@@ -279,6 +279,11 @@ def withdraw(self):
 
     def close(self):
         self.status = POSTSTATUS.CLOSED
+        self.closed_datetime = datetime.utcnow()
+
+    def delete(self):
+        self.status = POSTSTATUS.DELETED
+        self.closed_datetime = datetime.utcnow()
 
     def confirm(self):
         self.status = POSTSTATUS.CONFIRMED
@@ -308,6 +313,8 @@ def url_for(self, action='view', _external=False, **kwargs):
             return url_for('withdraw', hashid=self.hashid, domain=domain, _external=_external, **kwargs)
         elif action == 'close':
             return url_for('close', hashid=self.hashid, domain=domain, _external=_external, **kwargs)
+        elif action == 'delete':
+            return url_for('delete', hashid=self.hashid, domain=domain, _external=_external, **kwargs)
         elif action == 'reopen':
             return url_for('reopen', hashid=self.hashid, domain=domain, _external=_external, **kwargs)
         elif action == 'moderate':

hasjob/templates/delete.html

@@ -0,0 +1,19 @@
+{% extends "sheet.html" %}
+{% from "baseframe/forms.html" import renderfield %}
+{% block title %}{{ post.headline|e }}{% endblock %}
+{% block content %}
+  <div class="sheet">
+    <div class="section first">
+      <h1>Delete this draft?</h1>
+      <h2>{{ post.headline }}</h2>
+      <p>
+        Deleted drafts will be gone forever, with no undo. Are you sure you want to delete?
+      </p>
+      <form method="POST" class="form-horizontal">
+        {{ form.hidden_tag() }}
+        <button type="submit" class="btn btn-danger">Delete</button>
+        <a class="btn btn-default" href="{{ post.url_for() }}">Cancel</a>
+      </form>
+    </div>
+  </div>
+{% endblock %}

hasjob/templates/detail.html

@@ -158,6 +158,10 @@ <h2>What’s wrong with it?</h2>
                 <a class="list-group-item" href="{{ post.url_for('withdraw') }}">
                   <i class="fa fa-fw fa-trash-o"></i>&nbsp;&nbsp; Withdraw this
                 </a>
+              {%- elif post.is_draft() %}
+                <a class="list-group-item" href="{{ post.url_for('delete') }}">
+                  <i class="fa fa-fw fa-trash-o"></i>&nbsp;&nbsp; Delete this draft
+                </a>
               {%- endif %}
               {%- if post.is_old() %}
                 <a class="list-group-item" href="{{ url_for('newjob', template=post.hashid) }}">

hasjob/views/listing.py

@@ -1011,12 +1011,29 @@ def close(domain, hashid, key):
     form = Form()
     if form.validate_on_submit():
         post.close()
-        post.closed_datetime = datetime.utcnow()
         db.session.commit()
         return redirect(post.url_for(), code=303)
     return render_template("close.html", post=post, form=form)
 
 
+@app.route('/delete/<hashid>', methods=('GET', 'POST'), defaults={'key': None}, subdomain='<subdomain>')
+@app.route('/delete/<hashid>', methods=('GET', 'POST'), defaults={'key': None})
+def delete(hashid, key):
+    post = JobPost.query.filter_by(hashid=hashid).options(db.load_only('id', 'status')).first_or_404()
+    if not post:
+        abort(404)
+    if not post.admin_is(g.user):
+        abort(403)
+    if not post.is_draft():
+        return redirect(post.url_for(), code=303)
+    form = Form()
+    if form.validate_on_submit():
+        post.delete()
+        db.session.commit()
+        return redirect(url_for('my_posts'), code=303)
+    return render_template("delete.html", post=post, form=form)
+
+
 @app.route('/<domain>/<hashid>/reopen', methods=('GET', 'POST'), defaults={'key': None}, subdomain='<subdomain>')
 @app.route('/<domain>/<hashid>/reopen', methods=('GET', 'POST'), defaults={'key': None})
 def reopen(domain, hashid, key):