Added page management for promotions

oscar/apps/dashboard/promotions/app.py

@@ -10,7 +10,9 @@ class PromotionsDashboardApplication(Application):
     name = None
     list_view = views.ListView
     page_list = views.PageListView
+    page_detail = views.PageDetailView
     create_redirect_view = views.CreateRedirectView
+    delete_page_promotion_view = views.DeletePagePromotionView
 
     for klass in PROMOTION_CLASSES:
         locals()['create_%s_view' % klass.classname()] = \
@@ -24,9 +26,13 @@ class PromotionsDashboardApplication(Application):
         urlpatterns = patterns('',
             url(r'^$', self.list_view.as_view(), name='promotion-list'),
             url(r'^pages/$', self.page_list.as_view(), name='promotion-list-by-page'),
+            url(r'^pages/(?P<path>.+)/$', self.page_detail.as_view(), name='promotion-list-by-url'),
             url(r'^create/$', 
                 self.create_redirect_view.as_view(), 
-                name='promotion-create-redirect'),)
+                name='promotion-create-redirect'),
+            url(r'^page-promotion/(?P<pk>\d+)/$', 
+                self.delete_page_promotion_view.as_view(), name='pagepromotion-delete')
+            )
 
         for klass in PROMOTION_CLASSES:
             code = klass.classname()

oscar/apps/dashboard/promotions/forms.py

@@ -2,7 +2,7 @@ from django import forms
 
 from oscar.forms.fields import ExtendedURLField
 from oscar.core.loading import get_classes
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
+from oscar.apps.promotions.conf import PROMOTION_CLASSES, PROMOTION_POSITIONS
 
 RawHTML, SingleProduct, PagePromotion = get_classes('promotions.models', 
     ['RawHTML', 'SingleProduct', 'PagePromotion'])
@@ -21,14 +21,9 @@ class RawHTMLForm(forms.ModelForm):
         model = RawHTML
 
 
-POSITION_CHOICES = (('page', 'Page'),
-                    ('right', 'Right-hand sidebar'),
-                    ('left', 'Left-hand sidebar'))
-
-
 class PagePromotionForm(forms.ModelForm):
     page_url = ExtendedURLField(label="URL")
-    position = forms.CharField(widget=forms.Select(choices=POSITION_CHOICES),
+    position = forms.CharField(widget=forms.Select(choices=PROMOTION_POSITIONS),
                                help_text="""Where in the page this content
                                             block will appear""")
 

oscar/apps/dashboard/promotions/views.py

@@ -8,7 +8,8 @@ from django.http import HttpResponseRedirect
 from django.db.models import Count
 
 from oscar.core.loading import get_classes, get_class
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
+from oscar.apps.promotions.layout import split_by_position
+from oscar.apps.promotions.conf import PROMOTION_CLASSES, PROMOTION_POSITIONS
 
 SingleProduct, RawHTML, Image, MultiImage, \
     AutomaticProductList, PagePromotion, HandPickedProductList = get_classes('promotions.models',
@@ -55,6 +56,31 @@ class PageListView(generic.TemplateView):
         return {'pages': pages}
 
 
+class PageDetailView(generic.TemplateView):
+    template_name = 'dashboard/promotions/page_detail.html'
+
+    def get_context_data(self, *args, **kwargs):
+        path = self.kwargs['path']
+        ctx = {'page_url': path,
+               'positions': self.get_positions_context_data(path),
+              }
+        return ctx
+
+    def get_positions_context_data(self, path):
+        ctx = []
+        for code, name in PROMOTION_POSITIONS:
+            promotions = PagePromotion._default_manager.select_related() \
+                                                       .filter(page_url=path,
+                                                               position=code) \
+                                                       .order_by('display_order')
+            ctx.append({
+                'code': code,
+                'name': name,
+                'promotions': promotions,
+            })
+        return ctx
+
+
 class PromotionMixin(object):
 
     def get_template_names(self):
@@ -62,6 +88,16 @@ class PromotionMixin(object):
                 'dashboard/promotions/form.html']
 
 
+class DeletePagePromotionView(generic.DeleteView):
+    template_name = 'dashboard/promotions/delete-pagepromotion.html'
+    model = PagePromotion
+
+    def get_success_url(self):
+        messages.info(self.request, "Promotion removed successfully")
+        return reverse('dashboard:promotion-list-by-url', 
+                       kwargs={'path': self.object.page_url})
+
+
 # ============
 # CREATE VIEWS
 # ============

oscar/apps/promotions/conf.py

@@ -11,5 +11,9 @@ def get_promotion_classes():
             HandPickedProductList)
 
 
+PROMOTION_POSITIONS = (('page', 'Page'),
+                       ('right', 'Right-hand sidebar'),
+                       ('left', 'Left-hand sidebar'))
+
 
 PROMOTION_CLASSES = get_promotion_classes()

oscar/apps/promotions/context_processors.py

@@ -27,6 +27,7 @@ def promotions(request):
 
     return context
 
+
 def _split_by_position(linked_promotions, context):
     """
     Split the list of promotions into separate lists, grouping

oscar/apps/promotions/layout.py

@@ -0,0 +1,13 @@
+def split_by_position(linked_promotions, context):
+    """
+    Split the list of promotions into separate lists, grouping
+    by position, and write these lists to the passed context.
+    """
+    for linked_promotion in linked_promotions:
+        promotion = linked_promotion.content_object
+        if not promotion:
+            continue
+        key = 'promotions_%s' % linked_promotion.position.lower()
+        if key not in context:
+            context[key] = []
+        context[key].append(promotion)

oscar/apps/promotions/models.py

@@ -21,7 +21,7 @@ class LinkedPromotion(models.Model):
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey('content_type', 'object_id')
-    
+
     position = models.CharField(_("Position"), max_length=100, help_text="Position on page")
     display_order = models.PositiveIntegerField(default=0)
     clicks = models.PositiveIntegerField(default=0)

oscar/templates/dashboard/promotions/delete-pagepromotion.html

@@ -0,0 +1,13 @@
+{% extends 'dashboard/layout.html' %}
+
+
+{% block dashboard_content %}
+<h1>Remove promotion from page?</h1>
+
+<form action="." method="post">
+	{% csrf_token %}
+    <p>Remove {{ object.content_object.type }} content block <strong>{{ object.name }}</strong> from page <strong>{{ object.page_url }}</strong> - are you sure?</p>
+	<p><button type="submit" class="btn btn-danger">Remove</button>
+	or <a href="{% url dashboard:promotion-list %}">cancel</a></p>
+</form>
+{% endblock %}

oscar/templates/dashboard/promotions/page_detail.html

@@ -0,0 +1,27 @@
+{% extends 'dashboard/layout.html' %}
+
+
+{% block dashboard_content %}
+
+<h1>Content blocks for page {{ page }}</h1>
+
+{% for position in positions %}
+<h2>Edit promotions in position '{{ position.name }}'</h2>
+{% if position.promotions %}
+<ul>
+    {% for promotion in position.promotions %}
+    <li>
+    {{ promotion.content_object.name }} - Type: {{ promotion.content_object.type }}
+    <a href="{% url dashboard:promotion-update promotion.content_object.code promotion.content_object.id %}" class="btn btn-success">Edit</a>
+    <a href="#" class="btn btn-info">Re-order</a>
+    <a href="{% url dashboard:pagepromotion-delete promotion.id %}" class="btn btn-danger">Remove</a>
+    </li>
+    {% endfor %}
+</ul>
+{% else %}
+    <p>No promotions in this position.</p>
+{% endif %}
+
+{% endfor %}
+
+{% endblock dashboard_content %}

oscar/templates/dashboard/promotions/pagepromotion_list.html

@@ -26,7 +26,7 @@
 			<td>{{ page.page_url }}</td>
 			<td>{{ page.freq }}</td>
 			<td>
-				<a href="" class="btn btn-info">Edit</a>
+                <a href="{% url dashboard:promotion-list-by-url page.page_url %}" class="btn btn-info">Edit</a>
 			</td>
 			<td>
 			</td>