Changeset 2465

Timestamp:

12/02/09 11:16:53 (8 months ago)

Author:

JensDiemer

Message:

New: change "page order" !

Location:

branches/0.9/pylucid_project/pylucid_plugins

Files:

• admin_menu/templates/admin_menu/includes/pylucid_admin_menu.html (modified) (1 diff)
• page_admin/admin_urls.py (modified) (1 diff)
• page_admin/admin_views.py (modified) (5 diffs)
• page_admin/forms.py (modified) (2 diffs)
• page_admin/templates/page_admin/page_order.html (added)

branches/0.9/pylucid_project/pylucid_plugins/admin_menu/templates/admin_menu/includes/pylucid_admin_menu.html

@@ -103 +103 @@
                     {% endif %}
 
+                    {% if perms.pylucid.change_pagetree %}
+                       <li><a href="{% url PageAdmin-page_order PYLUCID.pagetree.id %}">change page order</a></li>
+                    {% endif %}
+
                     {% if perms.pylucid.delete_pageplugin and perms.pylucid.delete_pagecontent and perms.pylucid.delete_pagemeta and perms.pylucid.delete_pagetree %}
                        <li><a href="{% url admin:pylucid_pagetree_delete PYLUCID.pagemeta.id %}">delete page</a></li>

branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_urls.py

@@ -18 +18 @@
 from django.conf.urls.defaults import patterns, url
 
+from pylucid_project.pylucid_plugins.page_admin import admin_views
 
-urlpatterns = patterns('page_admin.admin_views',
-    url(r'^new_content_page/$', "new_content_page", name='PageAdmin-new_content_page'),
-    url(r'^new_plugin_page/$', "new_plugin_page", name='PageAdmin-new_plugin_page'),
-    url(r'^edit_page/(?P<pagetree_id>\d+?)/$', "edit_page", name='PageAdmin-edit_page'),
-    url(r'^translate/(?P<pagemeta_id>\d+?)/$', "translate", name='PageAdmin-translate'),
-    url(r'^tag_list/$', "tag_list", name='PageAdmin-tag_list'),
+urlpatterns = patterns('',
+    url(r'^new_content_page/$', admin_views.new_content_page, name='PageAdmin-new_content_page'),
+    url(r'^new_plugin_page/$', admin_views.new_plugin_page, name='PageAdmin-new_plugin_page'),
+    url(r'^edit_page/(?P<pagetree_id>\d+?)/$', admin_views.edit_page, name='PageAdmin-edit_page'),
+    url(r'^page_order/(?P<pagetree_id>\d+?)/$', admin_views.page_order, name='PageAdmin-page_order'),
+    url(r'^translate/(?P<pagemeta_id>\d+?)/$', admin_views.translate, name='PageAdmin-translate'),
+    url(r'^tag_list/$', admin_views.tag_list, name='PageAdmin-tag_list'),
 )

branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views.py

@@ -1 @@
-# coding:utf-8
+# coding:utf - 8
 
 import inspect
@@ -6 +6 @@
 from django.conf import settings
 from django.db import transaction
+from django.forms.models import modelformset_factory
 from django.utils.translation import ugettext_lazy as _
 
@@ -18 +19 @@
 from pylucid_admin.admin_menu import AdminMenu
 
-from page_admin.forms import PageTreeForm, PageMetaForm, PageContentForm, PluginPageForm, LanguageSelectForm
+from page_admin.forms import PageTreeForm, PageMetaForm, PageContentForm, PluginPageForm, \
+                                     LanguageSelectForm, PageOrderFormSet
 
 
@@ -393 +395 @@
 
     pagetree = PageTree.objects.get(id=pagetree_id)
-
-    context = {
-        "form_url": request.path,
-    }
+    context = {"form_url": request.path}
 
     is_pluginpage = pagetree.page_type == PageTree.PLUGIN_TYPE
     if is_pluginpage:
-#        return _edit_plugin_page(request)
-
         return _edit_plugin_page(request, context, pagetree)
     else:
         return _edit_content_page(request, context, pagetree)
+
+
+
+@check_permissions(superuser_only=False, permissions=("pylucid.change_pagetree",))
+@render_to("page_admin/page_order.html")
+def page_order(request, pagetree_id=None):
+    """
+    Change PageTree 'position', the ordering weight for sorting the pages in the menu.
+    """
+    try:
+        pagetree = PageTree.on_site.get(id=pagetree_id)
+    except PageTree.DoesNotExist, err:
+        raise PageTree.DoesNotExist(
+            "PageTree with ID %r doesn't exist. (Original error: %s)" % (pagetree_id, err)
+        )
+    parent = pagetree.parent
+
+    queryset = PageTree.on_site.all().order_by("position")
+    queryset = queryset.filter(parent=parent)
+
+    if request.method == 'POST':
+        formset = PageOrderFormSet(request.POST, queryset=queryset)
+        if formset.is_valid():
+            formset.save()
+            request.page_msg("New position saved.")
+            return http.HttpResponseRedirect(request.path)
+    else:
+        formset = PageOrderFormSet(queryset=queryset)
+
+    # Change field label ("position") to PageTree.slug
+    for form in formset.forms:
+        for field_name, field in form.fields.iteritems():
+            field.label = form.instance.slug
+            field.help_text = form.instance.get_absolute_url()
+
+    context = {
+        "title": "Change the page order.",
+        "pagetree": pagetree,
+        "abort_url": pagetree.get_absolute_url(),
+#        "next_level": 
+        "formset": formset,
+    }
+    if parent is not None:
+        context["previous_level"] = parent
+
+    try:
+        context["next_level"] = PageTree.on_site.order_by("position").filter(parent=pagetree)[0]
+    except IndexError:
+        pass
+
+    return context
+
+
+
+
+
+
 
 
@@ -443 +497 @@
         })
         return context
+
 
 

branches/0.9/pylucid_project/pylucid_plugins/page_admin/forms.py

@@ -4 +4 @@
 from django.template import mark_safe
 from django.forms.util import ErrorList
-from django.forms.models import BaseModelFormSet, modelformset_factory
-from django.contrib.auth.models import User, Group
+from django.forms.models import modelformset_factory
 from django.utils.translation import ugettext as _
 
@@ -122 +121 @@
 
 
+class PageOderForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        """ Change form field data in a DRY way """
+        super(PageOderForm, self).__init__(*args, **kwargs)
+        choices = [(i, i) for i in range(-10, 10)]
+        for field_name, field in self.fields.iteritems():
+            field.widget = forms.widgets.Select(choices=choices)
+#            print field, field_name
+
+    class Meta:
+        model = PageTree
+
+PageOrderFormSet = modelformset_factory(
+    model=PageTree, form=PageOderForm, extra=0, fields=('position',)
+)
+
+
+
 class LanguageSelectForm(forms.Form):
     language = forms.ChoiceField()