From 62200827c2df8f8aee40e172384afef058cf4ff7 Mon Sep 17 00:00:00 2001 From: guillaume-renaud Date: Thu, 5 Jan 2017 00:52:27 +0100 Subject: [PATCH] Finish back up app Stock --- stock/models.py | 11 +++++++++++ stock/views.py | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/stock/models.py b/stock/models.py index 46f30b34..666e7117 100644 --- a/stock/models.py +++ b/stock/models.py @@ -1,6 +1,8 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse +from django.conf import settings + from counter.models import Counter, ProductType @@ -17,6 +19,9 @@ class Stock(models.Model): def get_absolute_url(self): return reverse('stock:list') + def can_be_viewed_by(self, user): + return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) + class StockItem(models.Model): """ The StockItem class, element of the stock @@ -34,6 +39,9 @@ class StockItem(models.Model): def get_absolute_url(self): return reverse('stock:items_list', kwargs={'stock_id':self.stock_owner.id}) + def can_be_viewed_by(self, user): + return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) + class ShoppingList(models.Model): """ The ShoppingList class, used to make an history of the shopping lists @@ -49,3 +57,6 @@ class ShoppingList(models.Model): def get_absolute_url(self): return reverse('stock:shoppinglist_list') + + def can_be_viewed_by(self, user): + return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) diff --git a/stock/views.py b/stock/views.py index 6520e650..96fa90ca 100644 --- a/stock/views.py +++ b/stock/views.py @@ -22,8 +22,11 @@ class StockItemList(CounterAdminTabsMixin, CanCreateMixin, ListView): pk_url_kwarg = "stock_id" current_tab = "stocks" - def can_be_viewed_by(self, user): - return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) + def get_context_data(self): + ret = super(StockItemList, self).get_context_data() + if 'stock_id' in self.kwargs.keys(): + ret['stock'] = Stock.objects.filter(id=self.kwargs['stock_id']).first(); + return ret class StockListView(CounterAdminTabsMixin, CanViewMixin, ListView): """ @@ -35,7 +38,7 @@ class StockListView(CounterAdminTabsMixin, CanViewMixin, ListView): def can_be_viewed_by(self, user): return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) - + class StockEditForm(forms.ModelForm): """ @@ -66,9 +69,6 @@ class StockEditView(CounterAdminTabsMixin, CanEditPropMixin, UpdateView): if 'stock' in self.request.GET.keys(): context['stock'] = Stock.objects.filter(id=self.request.GET['stock']).first() return context - - def can_be_viewed_by(self, user): - return user.is_in_group(settings.SITH_GROUP_COUNTER_ADMIN_ID) class StockItemEditView(CounterAdminTabsMixin, CanEditPropMixin, UpdateView):