Allow managing users in partner dashboard.

oscar/apps/dashboard/partners/app.py

@@ -11,6 +11,10 @@ class PartnersDashboardApplication(Application):
     create_view = views.PartnerCreateView
     update_view = views.PartnerUpdateView
     delete_view = views.PartnerDeleteView
+    manage_users_view = views.PartnerManageUsers
+    update_user_view = views.PartnerUpdateUserView
+    unlink_user_view = views.PartnerUnlinkUserView
+    create_user_view = views.PartnerCreateUserView
 
     def get_urls(self):
         urlpatterns = patterns('',
@@ -21,11 +25,19 @@ class PartnersDashboardApplication(Application):
                 name='partner-update'),
             url(r'^(?P<pk>\d+)/delete/$', self.delete_view.as_view(),
                 name='partner-delete'),
+            url(r'^(?P<pk>\d+)/manage_users/$', self.manage_users_view.as_view(),
+                name='partner-manage-users'),
+            url(r'^user/add_for/(?P<partner_pk>\d+)/$', self.create_user_view.as_view(),
+                name='partner-create-user'),
+            url(r'^user/(?P<pk>\d+)/update/$', self.update_user_view.as_view(),
+                name='partner-update-user'),
+            url(r'^user/(?P<user_pk>\d+)/unlink_from/(?P<partner_pk>\d+)/$',
+                self.unlink_user_view.as_view(), name='partner-unlink-user'),
+
         )
         return self.post_process_urls(urlpatterns)
 
     def get_url_decorator(self, url_name):
         return staff_member_required
 
-
 application = PartnersDashboardApplication()

oscar/apps/dashboard/partners/forms.py

@@ -1,6 +1,8 @@
+from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 from django.db.models import get_model
 from django import forms
+from oscar.apps.customer.forms import EmailUserCreationForm
 
 
 Partner = get_model('partner', 'Partner')
@@ -14,3 +16,9 @@ class PartnerCreateForm(forms.ModelForm):
     class Meta:
         model = Partner
         fields = ('name',)
+
+
+class UserForm(EmailUserCreationForm):
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name', 'email', 'password1', 'password2')

oscar/apps/dashboard/partners/views.py

@@ -1,8 +1,12 @@
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse_lazy, reverse
 from django.db.models import get_model
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
+from oscar.apps.dashboard.partners.forms import UserForm
 
 from oscar.core.loading import get_classes
 from oscar.views.generic import BulkEditMixin
@@ -62,12 +66,28 @@ class PartnerCreateView(generic.CreateView):
     form_class = PartnerCreateForm
     success_url = reverse_lazy('dashboard:partner-list')
 
+    def get_context_data(self, **kwargs):
+        ctx = super(PartnerCreateView, self).get_context_data(**kwargs)
+        ctx['title'] = _('Create new partner')
+        return ctx
+
+    def get_success_url(self):
+        messages.success(self.request,
+                         _("Partner '%s' was created successfully.") %
+                         self.object.name)
+        return reverse_lazy('dashboard:partner-list')
+
 
 class PartnerUpdateView(generic.UpdateView):
     model = Partner
     template_name = 'dashboard/partners/partner_form.html'
     form_class = PartnerCreateForm
 
+    def get_context_data(self, **kwargs):
+        ctx = super(PartnerUpdateView, self).get_context_data(**kwargs)
+        ctx['title'] = _("Partner '%s'") % self.object.name
+        return ctx
+
     def get_success_url(self):
         messages.success(self.request,
                          _("Partner '%s' was updated successfully.") %
@@ -85,3 +105,87 @@ class PartnerDeleteView(generic.DeleteView):
                          self.object.name)
         return reverse_lazy('dashboard:partner-list')
 
+
+class PartnerCreateUserView(generic.CreateView):
+    model = User
+    template_name = 'dashboard/partners/partner_user_form.html'
+    form_class = UserForm
+
+    def dispatch(self, request, *args, **kwargs):
+        self.partner = get_object_or_404(Partner,
+                                         pk=kwargs.get('partner_pk', None))
+        return super(PartnerCreateUserView, self).dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        ctx = super(PartnerCreateUserView, self).get_context_data(**kwargs)
+        ctx['title'] = _("Create user for partner '%s'") % self.partner.name
+        return ctx
+
+    def form_valid(self, form):
+        ret = super(PartnerCreateUserView, self).form_valid(form)
+        self.partner.users.add(self.object)
+        return ret
+
+    def get_success_url(self):
+        name = self.object.get_full_name() or self.object.email
+        messages.success(self.request,
+                         _("User '%s' was created successfully.") % name)
+        return reverse_lazy('dashboard:partner-list')
+
+
+class PartnerUpdateUserView(generic.UpdateView):
+    model = User
+    template_name = 'dashboard/partners/partner_user_form.html'
+    form_class = UserForm
+
+    def get_context_data(self, **kwargs):
+        name = self.object.get_full_name() or self.object.email
+        ctx = super(PartnerUpdateUserView, self).get_context_data(**kwargs)
+        ctx['title'] = _("Edit user '%s'") % name
+        return ctx
+
+    def get_success_url(self):
+        name = self.object.get_full_name() or self.object.email
+        messages.success(self.request,
+                         _("User '%s' was updated successfully.") % name)
+        return reverse_lazy('dashboard:partner-list')
+
+
+class PartnerManageUsers(generic.ListView):
+    model = User
+    template_name = 'dashboard/partners/manage_users.html'
+    context_object_name = 'users'
+
+    def dispatch(self, request, *args, **kwargs):
+        self.partner = get_object_or_404(Partner,
+                                         pk=kwargs.get('pk', None))
+        return super(PartnerManageUsers, self).dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        ctx = super(PartnerManageUsers, self).get_context_data(**kwargs)
+        ctx['partner'] = self.partner
+        ctx['title'] = _("Manage users for partner '%s'") % self.partner.name
+        return ctx
+
+    def get_queryset(self):
+        return self.partner.users.all()
+
+
+class PartnerUnlinkUserView(generic.View):
+
+    def post(self, request, user_pk, partner_pk):
+        user = get_object_or_404(User, pk=user_pk)
+        name = user.get_full_name() or user.email
+        partner = get_object_or_404(Partner, pk=partner_pk)
+        users = partner.users.all()
+        if user in users:
+            partner.users.remove(user)
+            messages.success(request, _("User '%s' was unlinked from '%s'") %
+                                      (name, partner.name))
+        else:
+            messages.error(request, _("User '%s' is not linked to '%s'") %
+                                    (name, partner.name))
+        return HttpResponseRedirect(reverse('dashboard:partner-manage-users',
+                                            kwargs={'pk': partner_pk}))
+
+

oscar/templates/oscar/dashboard/partners/manage_users.html

@@ -0,0 +1,56 @@
+{% extends 'dashboard/layout.html' %}
+{% load sorting_tags %}
+{% load i18n %}
+
+{% block title %}
+{% trans "Partner management" %} | {{ block.super }}
+{% endblock %}
+
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+        <span class="divider">/</span>
+	    <a href="{% url dashboard:partner-list %}">{% trans "Partner management" %}</a>
+	    <span class="divider">/</span>
+    </li>
+    <li class="active">{{ title }}</li>
+</ul>
+{% endblock %}
+
+{% block header %}
+<div class="page-header">
+	<a href="{% url dashboard:partner-create-user partner.pk %}" class="btn btn-primary pull-right"><i class="icon-plus"></i> {% trans "Link a new user" %}</a>
+    <h1>{{ title }}</h1>
+</div>
+{% endblock header %}
+
+{% block dashboard_content %}
+            <table class="table table-striped table-bordered">
+                {% if users.count %}
+                <tr>
+                    <th>{% trans 'Email' %}</th>
+	                <th>{% trans 'First name' %}</th>
+	                <th>{% trans 'Last name' %}</th>
+	                <th>&nbsp;</th>
+                </tr>
+                {% for user in users %}
+                <tr>
+                    <td><a href="{% url dashboard:partner-update-user user.id %}">{{ user.email }}</a></td>
+	                <td>{{ user.first_name }}</td>
+	                <td>{{ user.last_name }}</td>
+                    <td>
+	                    <form action="{% url dashboard:partner-unlink-user user.id partner.pk %}" method="post">
+		                {% csrf_token %}
+		                <button type="submit" class="btn">{% trans 'Unlink user' %}</button>
+		                </form>
+                    </td>
+                </tr>
+                {% endfor %}
+
+                {% else %}
+                <tr><td>{% trans "No users linked." %}</td></tr>
+                {% endif %}
+            </table>
+            {% include "partials/pagination.html" %}
+{% endblock dashboard_content %}

oscar/templates/oscar/dashboard/partners/partner_list.html

@@ -43,11 +43,33 @@
                 {% if partners.count %}
                 <tr>
                     <th>{% anchor 'name' _('Partner name') %}</th>
-                    <th></th>
+	                <th>{% trans 'Users' %}</th>
+                    <th>&nbsp;</th>
                 </tr>
                 {% for partner in partners %}
                 <tr>
-                    <td><a href="{% url dashboard:partner-update partner.pk %}">{{ partner.name }}</a></td>
+                    <td>
+	                    <a href="{% url dashboard:partner-update partner.pk %}">
+		                    {{ partner.name }}
+	                    </a>
+                    </td>
+	                <td>
+			            {% with users=partner.users.all %}
+			            {% if users %}
+							<ul>
+							{% for user in users %}
+								<li>
+									<a href="{% url dashboard:partner-update-user user.id %}" title="{% trans "Edit the user's details" %}">
+										{{ user.get_full_name|default:user.email }}
+									</a>
+								</li>
+							{% endfor %}
+							</ul>
+			            {% else %}
+							{% trans 'No users associated.' %}
+			            {% endif %}
+			            {% endwith %}
+	                </td>
                     <td>
                         <div class="btn-toolbar">
                             <div class="btn-group">
@@ -56,8 +78,12 @@
                                 <span class="caret"></span>
                               </a>
                               <ul class="dropdown-menu pull-right">
-                                  <li><a class="" href="{% url dashboard:partner-update partner.pk %}">{% trans "Edit" %}</a></li>
-                                  <li><a class="" href="{% url dashboard:partner-delete partner.pk %}">{% trans "Delete" %}</a></li>
+                                  <li><a href="{% url dashboard:partner-update partner.pk %}">{% trans "Edit" %}</a></li>
+                                  <li><a href="{% url dashboard:partner-delete partner.pk %}">{% trans "Delete" %}</a></li>
+	                              {% if partner.users.count %}
+	                              <li><a href="{% url dashboard:partner-manage-users partner.pk %}">{% trans "Manage users" %}</a></li>
+	                              {% endif %}
+	                              <li><a href="{% url dashboard:partner-create-user partner.pk %}">{% trans "Link a new user" %}</a></li>
                               </ul>
                             </div>
                         </div>

oscar/templates/oscar/dashboard/partners/partner_user_form.html

@@ -0,0 +1,33 @@
+{% extends 'dashboard/layout.html' %}
+{% load category_tags %}
+{% load i18n %}
+{% block body_class %}create-page partner{% endblock %}
+
+{% block title %}
+{{ title }} | {% trans "Partner management" %} | {{ block.super }}
+{% endblock %}
+
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+        <span class="divider">/</span>
+    </li>
+    <li>
+        <a href="{% url dashboard:partner-list %}">{% trans "Partner management" %}</a>
+        <span class="divider">/</span>
+    </li>
+    <li class="active">{{ title }}</li>
+</ul>
+{% endblock %}
+
+{% block headertext %}{{ title }}{% endblock %}
+
+{% block dashboard_content %}
+    <div class="table-header">
+        <h2>{{ title }}</h2>
+    </div>
+    <div class="well">
+        {% include 'partials/form.html' %}
+    </div>
+{% endblock dashboard_content %}