aboutsummaryrefslogtreecommitdiff
path: root/app/dispatch/views.py
diff options
context:
space:
mode:
authorMitch Riedstra <Mitch@riedstra.us>2017-10-30 17:06:23 -0400
committerMitch Riedstra <Mitch@riedstra.us>2017-10-30 17:06:23 -0400
commitec9428fdf76b5d70d0f3bcdff3b85e3a83d5f3d5 (patch)
tree6ae862656a003d683f537d078599f98bbfa2675d /app/dispatch/views.py
parent1949503b55ea622d7c466e4b433f4d90e7eff125 (diff)
downloaddispatch-tracker-ec9428fdf76b5d70d0f3bcdff3b85e3a83d5f3d5.tar.gz
dispatch-tracker-ec9428fdf76b5d70d0f3bcdff3b85e3a83d5f3d5.tar.xz
Proper redirect on edit for users. Delete for loads, warning on delete. Invoice view ordered by PK desc
Diffstat (limited to 'app/dispatch/views.py')
-rw-r--r--app/dispatch/views.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/app/dispatch/views.py b/app/dispatch/views.py
index 63cc1aa..95aff28 100644
--- a/app/dispatch/views.py
+++ b/app/dispatch/views.py
@@ -151,7 +151,6 @@ class DriverSummary(UserPassesTestMixin, LoadDateSort):
class DriverUpdate(UserPassesTestMixin, UpdateView):
template_name = "dispatch/drivers/edit.html"
model = User
- success_url = reverse_lazy('driver_list')
# fields = ['username', 'first_name','last_name','email','groups']
fields = []
@@ -174,8 +173,10 @@ class DriverUpdate(UserPassesTestMixin, UpdateView):
def test_func(self):
# Seems a little hacky at first but it works!
- return self.request.user.is_superuser or \
+ test = self.request.user.is_superuser or \
self.get_object().pk is self.request.user.id
+ print(test)
+ return test
# Customer CRUD
@@ -434,7 +435,7 @@ class IdentityUpdate(UserPassesTestMixin, UpdateView):
model = Identity
fields = []
- defualt_fields = ['name', 'address', 'city', 'state', 'zip_code']
+ default_fields = ['name', 'address', 'city', 'state', 'zip_code']
superuser_fields = ['user', 'name', 'address', 'city', 'state', 'zip_code']
def get(self, request, *args, **kwargs):
@@ -454,6 +455,12 @@ class InvoiceList(FilteredListView):
template_name = "dispatch/invoice/list.html"
model = Invoice
+ def get_queryset(self):
+ # TODO: allow for a pagination
+ base_qs = super(InvoiceList, self).get_queryset()
+ # Give me the newest ones first
+ return base_qs.order_by('-pk')
+
class InvoiceDetail(DetailView):
template_name = "dispatch/invoice/detail.html"