Changeset 1:353c0fb6a2b2

Timestamp:

06/29/07 11:59:21 (5 years ago)

Author:

blackbird@…

Branch:

default

Message:

some more changes in the admin panel

Location:

textpress

Files:

• models.py (modified) (2 diffs)
• models.pyc (modified) (previous)
• shared/admin/style.css (modified) (2 diffs)
• templates/admin/delete_post.html (added)
• templates/admin/delete_tag.html (added)
• templates/admin/edit_post.html (modified) (1 diff)
• templates/admin/edit_tag.html (modified) (1 diff)
• templates/admin/show_users.html (added)
• urls.py (modified) (1 diff)
• urls.pyc (modified) (previous)
• views/__init__.py (modified) (1 diff)
• views/__init__.pyc (modified) (previous)
• views/admin.py (modified) (7 diffs)
• views/admin.pyc (modified) (previous)

textpress/models.py

@@ -550 +550 @@
         primaryjoin=comments.c.parent_id == comments.c.comment_id,
         cascade='all', order_by=[db.asc(comments.c.pub_date)],
-        backref=db.backref('parent', remote_side=[comments.c.comment_id])
+        backref=db.backref('parent', remote_side=[comments.c.comment_id]),
+        lazy=True
     )
 }, order_by=[db.desc(comments.c.pub_date)])
@@ -560 +561 @@
     'tags':         db.relation(Tag, secondary=post_tags, lazy=False,
                                 order_by=[db.asc(tags.c.name)],
-                                cascade='all', backref='posts')
+                                cascade='all, expunge', backref='posts')
 }, order_by=[db.desc(posts.c.pub_date)])

textpress/shared/admin/style.css

@@ -205 +205 @@
 }
 
+div.contents input[name="delete"]:hover {
+    background-color: #d00;
+    color: white;
+}
+
 div.contents fieldset {
     margin: 10px 0 0 0;
@@ -280 +285 @@
 div.contents table tr.even {
     background-color: #f2f2f2;
+}
+
+p.preview {
+    text-align: right;
 }
 

textpress/templates/admin/edit_post.html

@@ -80 +80 @@
       </fieldset>
     {%- endif %}
+    {% if not new_post %}
+      <p class="preview">
+        <a href="{{ url_for(post) }}">{% trans "View Post" %}</a>
+      </p>
+    {% endif %}
     <div class="actions">
       <input type="submit" name="save_and_new" value="{% trans 'Save' %}">
       <input type="submit" name="save_and_continue" value="{% trans 'Save and continue editing' %}">
+      {%- if not new_post %}
+        <input type="submit" name="delete" value="{% trans 'Delete' %}">
+      {%- endif %}
       <input type="submit" name="cancel" value="{% trans 'Cancel' %}">
     </div>

textpress/templates/admin/edit_tag.html

@@ -28 +28 @@
     <div class="actions">
       <input type="submit" value="{% trans 'Save' %}">
+      <input type="submit" name="delete" value="{% trans 'Delete' %}">
       <input type="submit" name="cancel" value="{% trans 'Cancel' %}">
     </div>

textpress/urls.py

@@ -35 +35 @@
         Rule('/posts/new', endpoint='admin/new_post'),
         Rule('/posts/<int:post_id>', endpoint='admin/edit_post'),
+        Rule('/posts/<int:post_id>/delete', endpoint='admin/delete_post'),
         Rule('/tags/', endpoint='admin/show_tags'),
         Rule('/tags/new', endpoint='admin/new_tag'),
-        Rule('/tags/<int:tag_id>', endpoint='admin/edit_tag')
+        Rule('/tags/<int:tag_id>', endpoint='admin/edit_tag'),
+        Rule('/tags/<int:tag_id>/delete', endpoint='admin/delete_tag'),
+        Rule('/users/', endpoint='admin/show_users'),
+        Rule('/users/new', endpoint='admin/new_user'),
+        Rule('/users/<int:user_id>', endpoint='admin/edit_user'),
+        Rule('/users/<int:user_id>/delete', endpoint='admin/delete_user')
     ])
 ]

textpress/views/__init__.py

@@ -30 +30 @@
     'admin/new_post':       admin.do_edit_post,
     'admin/edit_post':      admin.do_edit_post,
+    'admin/delete_post':    admin.do_delete_post,
     'admin/show_tags':      admin.do_show_tags,
     'admin/new_tag':        admin.do_edit_tag,
     'admin/edit_tag':       admin.do_edit_tag,
+    'admin/delete_tag':     admin.do_delete_tag,
+    'admin/show_users':     admin.do_show_users,
+    'admin/new_user':       admin.do_edit_user,
+    'admin/edit_user':      admin.do_edit_user,
+    'admin/delete_user':    admin.do_delete_user,
     'admin/login':          admin.do_login,
     'admin/logout':         admin.do_logout

textpress/views/admin.py

@@ -33 +33 @@
             ('overview', url_for('admin/show_tags'), _('Overview')),
             ('edit', url_for('admin/new_tag'), _('Edit Tag'))
+        ]),
+        ('users', url_for('admin/show_users'), _('Users'), [
+            ('overview', url_for('admin/show_users'), _('Users')),
+            ('edit', url_for('admin/new_user'), _('Edit User'))
         ])
     ]
@@ -69 +73 @@
     errors = []
     form = {}
+    post=None
 
     # edit existing post
@@ -110 +115 @@
             redirect(url_for('admin/show_posts'))
 
+        # handle delete, redirect to confirmation page
+        if req.form.get('delete') and post_id is not None:
+            redirect(url_for('admin/delete_post', post_id=post_id))
+
         form['title'] = title = req.form.get('title')
         if not title:
@@ -197 +206 @@
         tags=Tag.select(),
         created=created,
+        new_post=new_post,
+        post=post,
         post_status_choices=[
             (STATUS_PUBLISHED, _('Published')),
@@ -203 +214 @@
         ]
     )
+
+
+def do_delete_post(req, post_id):
+    post = Post.get(post_id)
+    if post is None:
+        redirect(url_for('admin/show_posts'))
+
+    if req.method == 'POST':
+        if req.form.get('cancel'):
+            redirect(url_for('admin/edit_post', post_id=post.post_id))
+        elif req.form.get('confirm'):
+            post.delete()
+            db.flush()
+            redirect(url_for('admin/show_posts'))
+
+    return render_admin_response('admin/delete_post.html', post=post)
 
 
@@ -229 +256 @@
 
     if req.method == 'POST':
+        # cancel
         if req.form.get('cancel'):
             redirect(url_for('admin/show_tags'))
+
+        # delete
+        if req.form.get('delete'):
+            redirect(url_for('admin/delete_tag', tag_id=tag.tag_id))
 
         form['slug'] = slug = req.form.get('slug')
@@ -256 +288 @@
         form=form
     )
+
+
+def do_delete_tag(req, tag_id):
+    tag = Tag.get(tag_id)
+    if tag is None:
+        redirect(url_for('admin/show_tags'))
+
+    if req.method == 'POST':
+        if req.form.get('cancel'):
+            redirect(url_for('admin/edit_tag', tag_id=tag.tag_id))
+        elif req.form.get('confirm'):
+            tag.delete()
+            db.flush()
+            redirect(url_for('admin/show_tags'))
+
+    return render_admin_response('admin/delete_tag.html', tag=tag)
+
+
+def do_show_users(req):
+    return render_admin_response('admin/show_users.html', users=User.select())
+
+
+def do_edit_user(req, user_id=None):
+    pass
+
+
+def do_delete_user(req, user_id):
+    pass