From 0223836a903463046ca93f1bf0250531abde6b4e Mon Sep 17 00:00:00 2001 From: orbitroom Date: Wed, 23 Mar 2016 02:18:46 -0400 Subject: [PATCH] Added Error handling to enforce using of zkillboard --- srp/views.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/srp/views.py b/srp/views.py index 1f9d8684..57818f34 100755 --- a/srp/views.py +++ b/srp/views.py @@ -192,16 +192,23 @@ def srp_request_view(request, fleet_srp): srp_request.additional_info = form.cleaned_data['additional_info'] srp_request.character = character srp_request.srp_fleet_main = srp_fleet_main - srp_kill_link = srpManager.get_kill_id(srp_request.killboard_link) - (srp_kill_data, ship_value) = srpManager.get_kill_data(srp_kill_link) - srp_ship_name = srpManager.get_ship_name(srp_kill_data) - srp_request.srp_ship_name = srp_ship_name - kb_total_loss = ship_value - srp_request.kb_total_loss = kb_total_loss - srp_request.save() - completed = True - logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (request.user, srp_fleet_main.fleet_name)) + try: + srp_kill_link = srpManager.get_kill_id(srp_request.killboard_link) + (srp_kill_data, ship_value) = srpManager.get_kill_data(srp_kill_link) + srp_ship_name = srpManager.get_ship_name(srp_kill_data) + srp_request.srp_ship_name = srp_ship_name + kb_total_loss = ship_value + srp_request.kb_total_loss = kb_total_loss + srp_request.save() + completed = True + logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (request.user, srp_fleet_main.fleet_name)) + except: + logger.info("Invalid Killmail Link") + return HttpResponseRedirect("/srp") + + + else: logger.debug("Returning blank SrpFleetUserRequestForm")