From 6cd737751ed8356f2845aee6c195c8ef354d06fb Mon Sep 17 00:00:00 2001
From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 24 Jun 2011 13:41:57 +0000
Subject: [PATCH] Resolves OSQA-661, adding functionality to allow deleting
 static pages in the administration

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1074 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 forum/skins/default/templates/osqaadmin/static_pages.html | 7 ++++++-
 forum/urls.py                                             | 3 ++-
 forum/views/admin.py                                      | 6 ++++++
 forum_modules/mysqlfulltext/startup.py                    | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/forum/skins/default/templates/osqaadmin/static_pages.html b/forum/skins/default/templates/osqaadmin/static_pages.html
index 7d0e567..ea49a26 100644
--- a/forum/skins/default/templates/osqaadmin/static_pages.html
+++ b/forum/skins/default/templates/osqaadmin/static_pages.html
@@ -18,7 +18,12 @@
                 {% for page in pages %}
                     <tr>
                         <th scope="row"><a href="{% url admin_edit_page id=page.id %}">{{ page.headline }}</a></th>
-                        <td><a class="changelink" href="{% url admin_edit_page id=page.id %}">{% trans "Edit" %}</a></td>
+                        <td style="width: 125px;"><a class="changelink" href="{% url admin_edit_page id=page.id %}">{% trans "Edit" %}</a></td>
+                        <td style="width: 125px;">
+                            <a onclick="return confirm('{% trans "Are you sure you want to delete this page?" %}');" class="deletelink" href="{% url admin_delete_page id=page.id %}">
+                                {% trans "Delete" %}
+                            </a>
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/forum/urls.py b/forum/urls.py
index d1e87bf..5485379 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -142,7 +142,8 @@ core_urls = (
     
     url(r'^%s%s%s$' % (_('admin/'), _('static_pages/'), _('new/')), app.admin.edit_page, name='admin_new_page'),
     url(r'^%s%s%s(?P<id>\d+)/$' % (_('admin/'), _('static_pages/'), _('edit/')), app.admin.edit_page, name='admin_edit_page'),
-    
+    url(r'^%s%s%s(?P<id>\d+)/$' % (_('admin/'), _('static_pages/'), _('delete/')), app.admin.delete_page, name='admin_delete_page'),
+
     url(r'^%s%s(?P<name>\w+)/$' % (_('admin/'), _('tools/')), app.admin.tools_page, name='admin_tools'),
     
     url(r'^%s%s(?P<set_name>\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set, name='admin_set'),
diff --git a/forum/views/admin.py b/forum/views/admin.py
index 724315f..6dffa51 100644
--- a/forum/views/admin.py
+++ b/forum/views/admin.py
@@ -401,6 +401,12 @@ def edit_page(request, id=None):
     'published': published
     })
 
+@admin_page
+def delete_page(request, id=None):
+    page = get_object_or_404(Page, id=id)
+    page.delete()
+    return HttpResponseRedirect(reverse('admin_static_pages'))
+
 @admin_tools_page(_('createuser'), _("Create new user"))
 def create_user(request):
     if request.POST:
diff --git a/forum_modules/mysqlfulltext/startup.py b/forum_modules/mysqlfulltext/startup.py
index 08926cb..8c2af5f 100644
--- a/forum_modules/mysqlfulltext/startup.py
+++ b/forum_modules/mysqlfulltext/startup.py
@@ -51,7 +51,7 @@ def question_search(self, keywords):
                 match(forum_mysqlftsindex.tagnames) against (%s) * 2 +
                 match(forum_mysqlftsindex.title) against (%s) * 4 +
                 match(forum_mysqlftsindex.body) against (%s) * 1
-                                """,
+                """,
             },
         select_params=[keywords, keywords, keywords]
     ).filter(Q(ftsindex__title__search=keywords) | Q(ftsindex__tagnames__search=keywords) | Q(ftsindex__body__search=keywords))
-- 
2.45.1