From 4194e8ee556f3109057fab0afb7894927b52713e Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 30 Sep 2015 02:08:19 +0300 Subject: Cleanup --- servo/views/admin.py | 47 +++-------------------------------------------- servo/views/customer.py | 2 +- servo/views/device.py | 6 +++--- servo/views/gsx.py | 4 ++-- servo/views/invoices.py | 26 +------------------------- servo/views/note.py | 2 +- servo/views/order.py | 6 +++--- servo/views/purchases.py | 14 ++++++++------ servo/views/shipments.py | 6 +++--- 9 files changed, 25 insertions(+), 88 deletions(-) (limited to 'servo/views') diff --git a/servo/views/admin.py b/servo/views/admin.py index c4e5aa8..6a54a4f 100644 --- a/servo/views/admin.py +++ b/servo/views/admin.py @@ -454,7 +454,7 @@ def delete_user(request, user_id): try: user.delete() messages.success(request, _("User deleted")) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(list_users) @@ -563,7 +563,7 @@ def delete_location(request, pk): try: location.delete() messages.success(request, _(u'%s deleted') % location.title) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(locations) @@ -654,47 +654,6 @@ def edit_notification(request, nid): return render(request, 'admin/notifications/form.html') -def list_sites(request): - if not request.user.is_superuser: - messages.error(request, _(u"Access denied")) - return redirect('/login/') - - data = {'sites': Site.objects.all()} - data['title'] = _(u"Manage Sites") - - return render(request, "admin/sites/index.html", data) - - -def edit_site(request, pk=None): - if not request.user.is_superuser: - messages.add_message(request, messages.ERROR, _(u"Access denied")) - return redirect('/login/') - - site = Site() - data = {'title': _(u"New Site")} - - if pk is not None: - site = Site.objects.get(pk=pk) - data['title'] = site.name - - SiteForm = modelform_factory(Site, exclude=[]) - form = SiteForm(instance=site) - - if request.method == "POST": - - form = SiteForm(request.POST, instance=site) - - if form.is_valid(): - form.save() - messages.add_message(request, messages.SUCCESS, _(u"Site saved")) - return redirect(list_sites) - - data['form'] = form - data['sites'] = Site.objects.all() - - return render(request, "admin/sites/edit_site.html", data) - - def upload_users(request): """ """ @@ -708,7 +667,7 @@ def upload_users(request): try: users = form.save() messages.success(request, _('%d users imported') % len(users)) - except Exception, e: + except Exception as e: messages.error(request, e) else: messages.error(request, form.errors) diff --git a/servo/views/customer.py b/servo/views/customer.py index 789121b..9adb3e5 100644 --- a/servo/views/customer.py +++ b/servo/views/customer.py @@ -296,7 +296,7 @@ def move(request, pk, new_parent=None): customer.move_to(new_parent) customer.save() # To update fullname messages.success(request, msg) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(customer) diff --git a/servo/views/device.py b/servo/views/device.py index 9babbd2..55895bc 100644 --- a/servo/views/device.py +++ b/servo/views/device.py @@ -302,7 +302,7 @@ def get_gsx_search_results(request, what, param, query): try: results = device.get_parts() data['device'] = device - except Exception, e: + except Exception as e: return render(request, error_template, {'message': e}) if param == "productName": @@ -532,7 +532,7 @@ def upload_devices(request): if gsx_account: try: device = Device.from_gsx(row[0]) - except Exception, e: + except Exception as e: messages.error(request, e) break else: @@ -569,7 +569,7 @@ def update_gsx_details(request, pk): GsxAccount.default(request.user) device.update_gsx_details() messages.success(request, _("Warranty status updated successfully")) - except Exception, e: + except Exception as e: messages.error(request, e) if request.session.get('return_to'): diff --git a/servo/views/gsx.py b/servo/views/gsx.py index bafdce5..ebd1952 100644 --- a/servo/views/gsx.py +++ b/servo/views/gsx.py @@ -160,7 +160,7 @@ def check_parts_warranty(request, repair): try: wty = repair.warranty_status() wty_parts = wty.parts - except Exception, e: + except Exception as e: return render(request, 'search/results/gsx_error.html', {'message': e}) try: @@ -349,7 +349,7 @@ def update_sn(request, pk, part): part.update_sn() msg = _(u'%s serial numbers updated') % part.part_number messages.success(request, msg) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(part.repair.order) diff --git a/servo/views/invoices.py b/servo/views/invoices.py index cc48c60..2fb7b26 100644 --- a/servo/views/invoices.py +++ b/servo/views/invoices.py @@ -1,28 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, First Party Software -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. from django import forms from django.utils import timezone @@ -181,7 +157,7 @@ def create_invoice(request, order_id=None, numbers=None): try: order.dispatch(invoice=invoice, products=products) messages.success(request, _(u'Order %s dispatched') % order.code) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(order) else: diff --git a/servo/views/note.py b/servo/views/note.py index 0d7ae06..a68312a 100644 --- a/servo/views/note.py +++ b/servo/views/note.py @@ -153,7 +153,7 @@ def edit(request, pk=None, order_id=None, parent=None, recipient=None, customer= try: note.escalation = Escalation(created_by=request.user) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(request.META['HTTP_REFERER']) diff --git a/servo/views/order.py b/servo/views/order.py index 43277c4..3d9adad 100644 --- a/servo/views/order.py +++ b/servo/views/order.py @@ -457,7 +457,7 @@ def remove_user(request, pk, user_id): if user == order.user: order.set_user(None, request.user) order.notify("unset_user", _('User %s removed from followers') % user, request.user) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(order) @@ -632,7 +632,7 @@ def device_from_product(request, pk, item_id): device.save() event = order.add_device(device, request.user) messages.success(request, event) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(order) @@ -676,7 +676,7 @@ def edit_product(request, pk, item_id): if item.product.component_code: try: GsxAccount.default(request.user, order.queue) - except Exception, e: + except Exception as e: return render(request, "snippets/error_modal.html", {'error': e}) form = OrderItemForm(instance=item) diff --git a/servo/views/purchases.py b/servo/views/purchases.py index 5a32857..7233ceb 100644 --- a/servo/views/purchases.py +++ b/servo/views/purchases.py @@ -67,8 +67,8 @@ def list_pos(request): orders = paginator.page(paginator.num_pages) data['orders'] = orders - data['form'] = form - data['total'] = all_orders.aggregate(Sum('total')) + data['form'] = form + data['total'] = all_orders.aggregate(Sum('total')) return render(request, "purchases/list_pos.html", data) @@ -92,7 +92,8 @@ def add_to_po(request, pk, product_id): def view_po(request, pk): - po = PurchaseOrder.objects.get(pk=pk) + po = get_object_or_404(PurchaseOrder, pk=pk) + products = po.purchaseorderitem_set.all() title = _('Purchase Order %d' % po.pk) return render(request, "purchases/view_po.html", locals()) @@ -158,7 +159,8 @@ def order_stock(request, po_id): if request.method == "POST": if po.submitted_at: - messages.error(request, _(u'Purchase Order %s has already been submitted') % po.pk) + msg = _(u'Purchase Order %s has already been submitted') % po.pk + messages.error(request, msg) return list_pos(request) act = GsxAccount.default(request.user) @@ -201,12 +203,12 @@ def delete_po(request, po_id): @permission_required('servo.add_purchaseorder') def create_po(request, product_id=None, order_id=None): po = PurchaseOrder(created_by=request.user) - location = request.user.get_location() - po.location = location + po.location = request.user.get_location() po.save() if order_id is not None: po.sales_order_id = order_id + po.save() for i in ServiceOrderItem.objects.filter(order_id=order_id): po.add_product(i, amount=1, user=request.user) diff --git a/servo/views/shipments.py b/servo/views/shipments.py index 3d0a56e..ada3a07 100644 --- a/servo/views/shipments.py +++ b/servo/views/shipments.py @@ -145,7 +145,7 @@ def view_incoming(request, pk): if form.is_valid(): try: item = form.save() - except gsxws.GsxError, e: + except gsxws.GsxError as e: messages.error(request, e) return redirect(view_incoming, date, pk) @@ -176,7 +176,7 @@ def return_label(request, code, return_order): try: label = gsxws.Returns(return_order) return HttpResponse(label.returnLabelFileData, content_type="application/pdf") - except Exception, e: + except Exception as e: messages.add_message(request, messages.ERROR, e) return redirect('products-list') @@ -252,7 +252,7 @@ def edit_bulk_return(request, pk=None, ship_to=None): msg = _(u"Bulk return %s submitted") % shipment.return_id messages.success(request, msg) return redirect(view_bulk_return, shipment.pk) - except Exception, e: + except Exception as e: messages.error(request, e) return redirect(edit_bulk_return, ship_to=ship_to) messages.success(request, msg) -- cgit v1.2.3