Minor tweaks to category management

oscar/apps/catalogue/abstract_models.py

@@ -71,7 +71,7 @@ class AbstractCategory(MP_Node):
             slug = slugify(self.name)
             if parent:
                 self.slug = '%s%s%s' % (parent.slug, self._slug_separator, slug)
-                self.full_name = '%s%s%s' % (parent.full_name, 
+                self.full_name = '%s%s%s' % (parent.full_name,
                                              self._full_name_separator, self.name)
             else:
                 self.slug = slug
@@ -92,17 +92,15 @@ class AbstractCategory(MP_Node):
                 slug_parts = [parent.slug]
                 name_parts = [parent.full_name]
                 curr_depth = parent.depth
-            self.__class__.update_subtree_properties(list(subtree), slug_parts, 
+            self.__class__.update_subtree_properties(list(subtree), slug_parts,
                                                 name_parts, curr_depth=curr_depth)
 
     @classmethod
     def update_subtree_properties(cls, nodes, slug_parts, name_parts, curr_depth):
-
         """
-            Update slugs and full_names of children in a subtree.
-            Assumes nodes were originally in DFS order.
+        Update slugs and full_names of children in a subtree.
+        Assumes nodes were originally in DFS order.
         """
-
         if nodes == []:
             return
 
@@ -142,6 +140,9 @@ class AbstractCategory(MP_Node):
         verbose_name_plural = 'Categories'
         verbose_name = 'Category'
 
+    def has_children(self):
+        return self.get_children().count() > 0
+
 
 class AbstractProductCategory(models.Model):
     """

oscar/apps/catalogue/app.py

@@ -10,11 +10,11 @@ class BaseCatalogueApplication(Application):
     detail_view = ProductDetailView
     index_view = ProductListView
     category_view = ProductCategoryView
-    
+
     def get_urls(self):
-        urlpatterns = super(BaseCatalogueApplication, self).get_urls()        
+        urlpatterns = super(BaseCatalogueApplication, self).get_urls()
         urlpatterns += patterns('',
-            url(r'^$', self.index_view.as_view(), name='index'),       
+            url(r'^$', self.index_view.as_view(), name='index'),
             url(r'^(?P<product_slug>[\w-]*)-(?P<pk>\d+)/$', self.detail_view.as_view(), name='detail'),
             url(r'^(?P<category_slug>[\w-]+(/[\w-]+)*)/$', self.category_view.as_view(), name='category')
         )
@@ -22,8 +22,8 @@ class BaseCatalogueApplication(Application):
 
 
 class ReviewsApplication(Application):
-    reviews_app = reviews_app    
-    
+    reviews_app = reviews_app
+
     def get_urls(self):
         urlpatterns = super(ReviewsApplication, self).get_urls()
         urlpatterns += patterns('',
@@ -37,4 +37,5 @@ class CatalogueApplication(BaseCatalogueApplication, ReviewsApplication):
     Composite class combining Products with Reviews
     """
 
+
 application = CatalogueApplication()

oscar/apps/dashboard/catalogue/forms.py

@@ -29,8 +29,7 @@ class CategoryForm(MoveNodeForm):
         return cleaned_data
 
     def is_slug_conflicting(self, name, ref_node_pk, position):
-        
-        #determine parent
+        # determine parent
         if ref_node_pk:
             ref_category = Category.objects.get(pk=ref_node_pk)
             if position == 'first-child':
@@ -40,11 +39,11 @@ class CategoryForm(MoveNodeForm):
         else:
             parent = None
 
-        #build full slug
+        # build full slug
         slug_prefix = (parent.slug + Category._slug_separator) if parent else ''
         slug = '%s%s' % (slug_prefix, slugify(name))
 
-        #check if slug is conflicting
+        # check if slug is conflicting
         try:
             category = Category.objects.get(slug=slug)
         except Category.DoesNotExist:

oscar/apps/dashboard/catalogue/views.py

@@ -270,20 +270,30 @@ class CategoryListMixin(object):
 
 
 class CategoryCreateView(CategoryListMixin, generic.CreateView):
-    template_name = 'dashboard/catalogue/category_create.html'
+    template_name = 'dashboard/catalogue/category_form.html'
     model = Category
     form_class = CategoryForm
 
+    def get_context_data(self, **kwargs):
+        ctx = super(CategoryCreateView, self).get_context_data(**kwargs)
+        ctx['title'] = "Add a new category"
+        return ctx
+
     def get_success_url(self):
         messages.info(self.request, "Category created successfully")
         return super(CategoryCreateView, self).get_success_url()
 
 
 class CategoryUpdateView(CategoryListMixin, generic.UpdateView):
-    template_name = 'dashboard/catalogue/category_create.html'
+    template_name = 'dashboard/catalogue/category_form.html'
     model = Category
     form_class = CategoryForm
 
+    def get_context_data(self, **kwargs):
+        ctx = super(CategoryUpdateView, self).get_context_data(**kwargs)
+        ctx['title'] = "Update category '%s'" % self.object.name
+        return ctx
+
     def get_success_url(self):
         messages.info(self.request, "Category updated successfully")
         return super(CategoryUpdateView, self).get_success_url()

oscar/templates/dashboard/catalogue/category_create.html → oscar/templates/dashboard/catalogue/category_form.html

@@ -3,7 +3,7 @@
 {% block body_class %}catalogue{% endblock %}
 
 {% block title %}
-Category management | {{ block.super }}
+{{ title }} | Category management | {{ block.super }}
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -16,25 +16,20 @@ Category management | {{ block.super }}
         <a href="{% url dashboard:catalogue-category-list %}">Categories</a>
         <span class="divider">/</span>
     </li>
-    <li class="active"><a href=".">{% if object %}Update category{% else %}Add a category{% endif %}</a></li>
+	<li class="active"><a href=".">{{ title }}</a></li>
 </ul>
 {% endblock %}
 
 {% block header %}
 <div class="page-header action">
-    <h1>{% if object %}Update category{% else %}Add a category{% endif %}</h1>
+	<h1>{{ title }}</h1>
 </div>
 {% endblock header %}
 
 {% block dashboard_content %}
-
-<form action="." method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <input type="submit" value="Save" />
-</form>
-
-<div class="sub-header">
-    <h2>{{ queryset_description }}</h2>
-</div>
-
+	<form action="." method="post" enctype="multipart/form-data">{% csrf_token %}
+		{{ form.as_p }}
+		<button type="submit" class="btn btn-primary btn-large">Save</button> or
+		<a href="{% url dashboard:catalogue-category-list %}">cancel</a>
+	</form>
 {% endblock dashboard_content %}

oscar/templates/dashboard/catalogue/category_list.html

@@ -12,7 +12,7 @@ Category management | {{ block.super }}
         <a href="{% url dashboard:index %}">Dashboard</a>
         <span class="divider">/</span>
     </li>
-    <li class="active"><a href=".">Categories</a></li>
+    <li class="active"><a href=".">Category management</a></li>
 </ul>
 {% endblock %}
 
@@ -25,38 +25,43 @@ Category management | {{ block.super }}
 {% block dashboard_content %}
 
 <div class="well well-info">
-    <h3 class="app-ico ico_expand icon"><a href="{% url dashboard:catalogue-category-create %}">Create a new category</a></h3>
-</div>
-
-<div class="well well-info">
-    <a href="{% url dashboard:catalogue-category-list %}">Home</a> >
+	<p>You are editing:
+    <a href="{% url dashboard:catalogue-category-list %}">Home</a>
     {% if ancestors %}
+	    &gt;
         {% for ancestor in ancestors %}
             <a href="{% url dashboard:catalogue-category-detail-list pk=ancestor.pk %}">{{ ancestor.name }}</a>{% if not forloop.last %} > {% endif %}
         {% endfor %}
     {% endif %}
+	</p>
 </div>
 
 <table class="table table-striped table-bordered">
+	<thead>
+		<tr>
+			<th>Name</th>
+			<th>Description</th>
+			<th>Number of child categories</th>
+			<th></th>
+		</tr>
+	</thead>
+	<tbody>
     {% for category in child_categories %}
         <tr>
+            <td>{{ category.name }}</td>
+			<td>{{ category.description|default:""|truncatewords:6 }}</td>
+			<td>{{ category.get_children_count }}</td>
             <td>
-            {% if category.get_children_count > 0 %}
-                <a href="{% url dashboard:catalogue-category-detail-list pk=category.pk %}">{{ category.name }}</a>
-            {% else %}
-                {{ category.name }}
-            {% endif %}
-            </td>
-            <td>
-                <a class="btn btn-primary" href="{% url dashboard:catalogue-category-update category.id %}">Edit</a>
-                <a class="btn btn-success" href="{% url dashboard:catalogue-category-delete category.id %}">Delete</a>
+                <a class="btn btn-primary" href="{% url dashboard:catalogue-category-update category.id %}">Edit category</a>
+				<a class="btn btn-primary {% if not category.has_children %}disabled{% endif %}" href="{% url dashboard:catalogue-category-detail-list pk=category.pk %}">Edit children</a>
+				<a class="btn btn-info" href="{{ category.get_absolute_url }}">View on site</a>
+                <a class="btn btn-danger" href="{% url dashboard:catalogue-category-delete category.id %}">Delete</a>
             </td>
         </tr>
     {% endfor %}
+	</tbody>
 </table>
 
-<div class="sub-header">
-    <h2>{{ queryset_description }}</h2>
-</div>
+<a class="btn btn-large btn-primary" href="{% url dashboard:catalogue-category-create %}">Create a new category</a>
 
 {% endblock dashboard_content %}

tests/unit/catalogue_tests.py

@@ -115,6 +115,16 @@ class TestCategoryFactory(TestCase):
         self.assertEqual(child.full_name, 'E > F')
 
 
+class TestCategory(TestCase):
+
+    def test_supports_has_children_method(self):
+        """Supports has_children method"""
+        root = Category.add_root(name="Products")
+        self.assertFalse(root.has_children())
+        root.add_child(name="Books")
+        self.assertTrue(root.has_children())
+
+
 class ProductTests(TestCase):
 
     def setUp(self):