Changeset 1126

Timestamp:

06/29/07 08:51:21 (17 months ago)

Author:

JensDiemer

Message:

new: sequencing pages reimplemented ;)

Location:

branches/0.8(django)/PyLucid

Files:

• models.py (modified) (1 diff)
• plugins_internal/page_admin/internal_pages/sequencing.html (modified) (1 diff)
• plugins_internal/page_admin/page_admin.py (modified) (1 diff)
• plugins_internal/page_admin/page_admin_cfg.py (modified) (3 diffs)

branches/0.8(django)/PyLucid/models.py

@@ -39 +39 @@
     position = models.IntegerField(
         default = 0,
-        help_text = "ordering (number between -10 and 10)"
+        help_text = "ordering weight for sorting the pages in the menu."
     )
 

branches/0.8(django)/PyLucid/plugins_internal/page_admin/internal_pages/sequencing.html

@@ -1 @@
-<h2>Sequencing pages</h2>
+<h2>{% trans 'Sequencing pages' %}</h2>
 
 <p>
-  Here you can change the page position by setting the weights.<br />
-  (ascending order)
+  {% trans 'Here you can change the page position by setting the weights.' %}<br />
+  ({% trans 'ascending order' %})
 </p>
 
-<form method="post" action="{{ url }}" id="sequencing">
-  <table id="sequencing">
+<p>
+{% trans 'Switch to a other page level:' %}
+{% if has_parents and not use_parent %}<a href="{{ base_url }}parents/">{% endif %}
+    &#xAB; {% trans 'parent' %}
+{% if has_parents and not use_parent %}</a>{% endif %}
+ |
+{% if not use_current %}<a href="{{ base_url }}">{% endif %}
+    {% trans 'current' %}
+{% if not use_current %}</a>{% endif %}
+ |
+{% if has_childs and not use_child %}<a href="{{ base_url }}childs/">{% endif %}
+    {% trans 'child' %} &#xBB;
+{% if has_childs and not use_child %}</a>{% endif %}
+</p>
+
+<form method="post" action="." id="sequencing">
+  <table>
   {% for page in sequencing_data %}
-  <tr>
-    <td class="name">{{ page.name|escapexml }}</td>
-    <td>weight: <strong>{{ page.position }}</strong></td>
+  <tr title="{{ page.title }}">
+    <td class="name">{{ page.name|escape }}</td>
+    <td>current weight: <strong>{{ page.position }}</strong></td>
     <td>
-      <select name="page_id_{{ page.id }}">
+      <select name="{{ page.id }}">
         {% for weight in weights %}
-          <option value="{{ weight }}" {% if weight equals page.position %}selected="selected"{% endif %}>
+          <option value="{{ weight }}" {% ifequal weight page.position %}selected="selected"{% endifequal %}>
              {{ weight }}
           </option>

branches/0.8(django)/PyLucid/plugins_internal/page_admin/page_admin.py

@@ -436 +436 @@
         return HttpResponse(html)
 
+    #___________________________________________________________________________
+
+    def _save_sequencing(self, page_data):
+        """
+        Save the new position weight for every pages, if changed.
+        """
+        no_changes = True
+        for page in page_data:
+            try:
+                page_id = str(page.id)
+                #page_id = "Not exists test"
+                weight = self.request.POST[page_id]
+                #weight = "Not a number test"
+                weight = int(weight)
+            except (KeyError, ValueError), msg:
+                self.page_msg.red(_("Error: Wrong POST data!"))
+                if settings.DEBUG:
+                    self.page_msg.red("Debug: %s" % msg)
+                # abort!
+                return
+
+            if page.position == weight:
+                # No change needed for this page
+                continue
+
+            # Set new position weight and save:
+            page.position = weight
+            page.save()
+
+            no_changes = False
+            self.page_msg.green(
+                _("Set position weight %s for page '%s', ok.") % (
+                    weight, page.name
+                )
+            )
+
+        if no_changes:
+            # Give feedback for the user, if nothing to do...
+            self.page_msg.green(_("Nothing to change ;)"))
+
+
+    def _get_sequence_data(self, url_args):
+        """
+        returned the pages and the "use"-mode.
+        Based on the url, the pages are from the "parent", "current", "child"
+        level.
+        """
+        # Start with "current" level. Only if the url starts with "parent" or
+        # "child" change the level.
+        use = "current"
+        if url_args != None:
+            if url_args.startswith("parent"):
+                use = "parent"
+                parent_page = Page.objects.get(
+                    id=self.current_page.parent.id
+                )
+                parent_filter = parent_page.parent
+            elif url_args.startswith("child"):
+                use = "child"
+                parent_filter = self.current_page.id
+
+        if use == "current":
+            # "url_args == None" or the url is not well-formed: It doesn't
+            # starts with "parent" or "child"
+            parent_filter = self.current_page.parent
+
+        # Change a "parent__exact=None" query to "parent__isnull=True"
+        # see: http://www.djangoproject.com/documentation/db-api/#isnull
+        if parent_filter == None:
+            filter_kwargs = {"parent__isnull": True}
+        else:
+            filter_kwargs = {"parent": parent_filter}
+
+        page_data = Page.objects.filter(**filter_kwargs)
+
+        return use, page_data
+
+
+    def sequencing(self, url_args=None):
+        """
+        Set the position weight of the cms page to change the correct order.
+        TODO: Save the weight range in the preferences
+        """
+        use, page_data = self._get_sequence_data(url_args)
+
+        if self.request.method == 'POST':
+            # Save new position weight
+            self._save_sequencing(page_data)
+
+        # Order the pages *after* a sended POST data processed.
+        page_data = page_data.order_by("position")
+
+        childs = Page.objects.filter(parent=self.current_page.id).count()
+        has_childs = childs != 0
+
+        parents = Page.objects.filter(parent=self.current_page.parent).count()
+        has_parents = parents != 0
+
+#        self.page_msg("url_args:", url_args)
+#        self.page_msg("use:", use)
+#        self.page_msg("filter_kwargs:", filter_kwargs)
+#        self.page_msg("has_childs:", has_childs, " - has_parents:", has_parents)
+
+        context = {
+            "sequencing_data": page_data,
+            "weights": range(-10, 10),
+
+            "base_url": self.URLs.methodLink("sequencing"),
+
+            "has_childs": has_childs,
+            "has_parents": has_parents,
+        }
+        context["use_%s" % use] = True
+
+        self._render_template("sequencing", context)#, debug=True)
+
 
 class DeletePageError(Exception):

branches/0.8(django)/PyLucid/plugins_internal/page_admin/page_admin_cfg.py

@@ -7 +7 @@
 __url__                 = "http://www.PyLucid.org"
 __description__         = "edit a CMS page"
-__long_description__    = """Edit a normal CMS pages"""
+__long_description__    = """
+-Edit/delete existing pages.
+-Create new pages.
+-Setup the page order in the menu.
+"""
 __can_deinstall__ = False
 
@@ -28 +32 @@
     "new_page"          : global_rights,
     "delete_page"       : global_rights,
-    "preview"           : global_rights,
-    "save"              : global_rights,
-    "encode_from_db"    : global_rights,
     "tinyTextile_help" : {
         "must_login"    : False,
@@ -63 +64 @@
         },
     },
-    "save_positions" : global_rights,
     "tag_list": {
         "must_login"    : True,