Move user account view into core

core/templates/core/user_account.jinja

@@ -5,6 +5,7 @@
 {% endblock %}
 
 {% block infos %}
+{% if customer %}
 <h3>{% trans %}User account{% endtrans %}</h3>
 <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
 {% if customer.refillings.exists() %}
@@ -80,6 +81,9 @@
     </tbody>
 </table>
 {% endif %}
+{% else %}
+<p>{% trans %}User has no account{% endtrans %}</p>
+{% endif %}
 {% endblock %}
 
 

core/urls.py

@@ -1,7 +1,6 @@
 from django.conf.urls import url, include
 
 from core.views import *
-from counter.views import UserAccountView
 
 urlpatterns = [
     url(r'^$', index, name='index'),

core/views/user.py

@@ -7,6 +7,7 @@ from django.views.generic.edit import UpdateView
 from django.views.generic import ListView, DetailView, TemplateView
 from django.forms.models import modelform_factory
 from django.forms import CheckboxSelectMultiple
+from django.conf import settings
 import logging
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
@@ -132,3 +133,31 @@ class UserToolsView(TemplateView):
     Displays the logged user's tools
     """
     template_name = "core/user_tools.jinja"
+
+class UserAccountView(DetailView):
+    """
+    Display a user's account
+    """
+    model = User
+    pk_url_kwarg = "user_id"
+    template_name = "core/user_account.jinja"
+
+    def dispatch(self, request, *arg, **kwargs): # Manually validates the rights
+        res = super(UserAccountView, self).dispatch(request, *arg, **kwargs)
+        if (self.object == request.user
+                or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name'])
+                or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])):
+            return res
+        raise PermissionDenied
+
+    def get_context_data(self, **kwargs):
+        kwargs = super(UserAccountView, self).get_context_data(**kwargs)
+        kwargs['profile'] = self.object
+        try:
+            kwargs['customer'] = self.object.customer
+        except:
+            pass
+        # TODO: add list of month where account has activity
+        return kwargs
+
+

counter/views.py

@@ -409,28 +409,3 @@ class ProductEditView(CanEditPropMixin, UpdateView):
     template_name = 'core/edit.jinja'
     # TODO: add management of the 'counters' ForeignKey
 
-# User accounting infos
-
-class UserAccountView(DetailView):
-    """
-    Display a user's account
-    """
-    model = Customer
-    pk_url_kwarg = "user_id"
-    template_name = "counter/user_account.jinja"
-
-    def dispatch(self, request, *arg, **kwargs): # Manually validates the rights
-        res = super(UserAccountView, self).dispatch(request, *arg, **kwargs)
-        if (self.object.user == request.user
-                or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name'])
-                or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])):
-            return res
-        raise PermissionDenied
-
-    def get_context_data(self, **kwargs):
-        kwargs = super(UserAccountView, self).get_context_data(**kwargs)
-        kwargs['profile'] = self.object.user
-        # TODO: add list of month where account has activity
-        return kwargs
-
-