Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-12 01:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

Browse Source 
# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

Fix some tests.
This commit is contained in:
Adarnof
2017-05-27 17:25:15 -04:00
parent ccc7412947 e76b0789f3
commit 971ce294ad
39 changed files with 997 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srp/form.py
View File

@@ -25,9 +25,5 @@ class SrpFleetUserRequestForm(forms.Form):
return data
class SrpFleetUpdateCostForm(forms.Form):
srp_total_amount = forms.IntegerField(required=True, label=_("Total SRP Amount"))
class SrpFleetMainUpdateForm(forms.Form):
fleet_aar_link = forms.CharField(required=True, label=_("After Action Report Link"))

3
srp/managers.py
View File

@@ -31,6 +31,7 @@ class SRPManager:
logger.debug("Ship type for kill ID %s is determined to be %s" % (kill_id, ship_type))
ship_value = result['zkb']['totalValue']
logger.debug("total loss value for kill id %s is %s" % (kill_id, ship_value))
return ship_type, ship_value
victim_name = result['victim']['characterName']
return ship_type, ship_value, victim_name
else:
raise ValueError("Invalid Kill ID")

209
srp/views.py
View File

@@ -3,12 +3,12 @@ from django.shortcuts import render, redirect, get_object_or_404
from django.contrib.auth.decorators import login_required
from django.contrib.auth.decorators import permission_required
from django.contrib import messages
from django.http import JsonResponse
from eveonline.managers import EveManager
from srp.models import SrpFleetMain
from srp.models import SrpUserRequest
from srp.form import SrpFleetMainForm
from srp.form import SrpFleetUserRequestForm
from srp.form import SrpFleetUpdateCostForm
from srp.form import SrpFleetMainUpdateForm
from srp.managers import SRPManager
from notifications import notify
@@ -56,7 +56,7 @@ def srp_fleet_view(request, fleet_id):
logger.debug("srp_fleet_view called by user %s for fleet id %s" % (request.user, fleet_id))
fleet_main = get_object_or_404(SrpFleetMain, id=fleet_id)
context = {"fleet_id": fleet_id, "fleet_status": fleet_main.fleet_srp_status,
"srpfleetrequests": fleet_main.srpuserrequest_set.all(),
"srpfleetrequests": fleet_main.srpuserrequest_set.order_by('srp_ship_name'),
"totalcost": fleet_main.total_cost}
return render(request, 'registered/srpfleetdata.html', context=context)
@@ -163,14 +163,21 @@ def srp_request_view(request, fleet_srp):
logger.debug("srp_request_view called by user %s for fleet srp code %s" % (request.user, fleet_srp))
if SrpFleetMain.objects.filter(fleet_srp_code=fleet_srp).exists() is False:
messages.error(request, _("Unable to locate SRP Fleet using code %(code)s") % fleet_srp)
return redirect(srp_management)
logger.error("Unable to locate SRP Fleet using code %s for user %s" % (fleet_srp, request.user))
messages.error(request,
_('Unable to locate SRP code with ID %(srpfleetid)s') % {"srpfleetid": fleet_srp})
return redirect("auth_srp_management_view")
if request.method == 'POST':
form = SrpFleetUserRequestForm(request.POST)
logger.debug("Request type POST contains form valid: %s" % form.is_valid())
if form.is_valid():
if SrpUserRequest.objects.filter(killboard_link=form.cleaned_data['killboard_link']).exists():
messages.error(request,
_("This Killboard link has already been posted."))
return redirect("auth_srp_management_view")
character = request.user.profile.main_character
srp_fleet_main = SrpFleetMain.objects.get(fleet_srp_code=fleet_srp)
post_time = timezone.now()
@@ -183,7 +190,7 @@ def srp_request_view(request, fleet_srp):
try:
srp_kill_link = SRPManager.get_kill_id(srp_request.killboard_link)
(ship_type_id, ship_value) = SRPManager.get_kill_data(srp_kill_link)
(ship_type_id, ship_value, victim_name) = SRPManager.get_kill_data(srp_kill_link)
except ValueError:
logger.debug("User %s Submitted Invalid Killmail Link %s or server could not be reached" % (
request.user, srp_request.killboard_link))
@@ -192,17 +199,21 @@ def srp_request_view(request, fleet_srp):
_(
"Your SRP request Killmail link is invalid. Please make sure you are using zKillboard."))
return redirect("auth_srp_management_view")
srp_ship_name = EveManager.get_itemtype(ship_type_id).name
srp_request.srp_ship_name = srp_ship_name
kb_total_loss = ship_value
srp_request.kb_total_loss = kb_total_loss
srp_request.post_time = post_time
srp_request.save()
logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (
request.user, srp_fleet_main.fleet_name))
messages.success(request, _('Submitted SRP request for your %(ship)s.') % {"ship": srp_ship_name})
return redirect(srp_management)
if request.user.characterownership_set.filter(character__character_name=victim_name).exists():
srp_request.srp_ship_name = EveManager.get_itemtype(ship_type_id).name
srp_request.kb_total_loss = ship_value
srp_request.post_time = post_time
srp_request.save()
logger.info("Created SRP Request on behalf of user %s for fleet name %s" % (
request.user, srp_fleet_main.fleet_name))
messages.success(request, _('Submitted SRP request for your %(ship)s.') % {"ship": srp_request.srp_ship_name})
return redirect("auth_srp_management_view")
else:
messages.error(request,
_("%(charname)s does not belong to your Auth account. Please add the API key for this character and try again")
% {"charname": victim_name})
return redirect("auth_srp_management_view")
else:
logger.debug("Returning blank SrpFleetUserRequestForm")
form = SrpFleetUserRequestForm()
@@ -214,88 +225,122 @@ def srp_request_view(request, fleet_srp):
@login_required
@permission_required('auth.srp_management')
def srp_request_remove(request, srp_request_id):
logger.debug("srp_request_remove called by user %s for srp request id %s" % (request.user, srp_request_id))
srpuserrequest = get_object_or_404(SrpUserRequest, id=srp_request_id)
srpuserrequest.delete()
logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user))
messages.success(request, _('Deleted SRP request from %(character)s for their %(ship)s.') % {
"character": srpuserrequest.character, "ship": srpuserrequest.srp_ship_name})
return redirect("auth_srp_fleet_view", srpuserrequest.srp_fleet_main.id)
def srp_request_remove(request):
numrequests = len(request.POST)-1
logger.debug("srp_request_remove called by user %s for %s srp request id's" % (request.user, numrequests))
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
messages.warning(request, _("No SRP requests selected"))
return redirect("auth_srp_management_view")
if srp_request_id == "csrfmiddlewaretoken":
continue
if SrpUserRequest.objects.filter(id=srp_request_id).exists():
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.delete()
logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user))
if stored_fleet_view is None:
logger.error("Unable to delete srp request id %s for user %s - request matching id not found." % (
srp_request_id, request.user))
messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
return redirect("auth_srp_management_view")
else:
messages.success(request, _('Deleted %(numrequests)s SRP requests') % {"numrequests": numrequests})
return redirect("auth_srp_fleet_view", stored_fleet_view)
@login_required
@permission_required('auth.srp_management')
def srp_request_approve(request, srp_request_id):
logger.debug("srp_request_approve called by user %s for srp request id %s" % (request.user, srp_request_id))
srpuserrequest = get_object_or_404(SrpUserRequest, id=srp_request_id)
srpuserrequest.srp_status = "Approved"
if srpuserrequest.srp_total_amount == 0:
srpuserrequest.srp_total_amount = srpuserrequest.kb_total_loss
srpuserrequest.save()
logger.info("Approved SRP request id %s for character %s by user %s" % (
srp_request_id, srpuserrequest.character, request.user))
messages.success(request, _('Approved SRP request from %(character)s for their %(ship)s.') % {
"character": srpuserrequest.character, "ship": srpuserrequest.srp_ship_name})
if srpuserrequest.character.userprofile:
notify(
srpuserrequest.character.userprofile.user,
'SRP Request Approved',
level='success',
message='Your SRP request for a %s lost during %s has been approved for %s ISK.' % (
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name,
intcomma(srpuserrequest.srp_total_amount))
)
return redirect("auth_srp_fleet_view", srpuserrequest.srp_fleet_main.id)
def srp_request_approve(request):
numrequests = len(request.POST)-1
logger.debug("srp_request_approve called by user %s for %s srp request id's" % (request.user, numrequests))
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
messages.warning(request, _("No SRP requests selected"))
return redirect("auth_srp_management_view")
if srp_request_id == "csrfmiddlewaretoken":
continue
if SrpUserRequest.objects.filter(id=srp_request_id).exists():
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.srp_status = "Approved"
if srpuserrequest.srp_total_amount == 0:
srpuserrequest.srp_total_amount = srpuserrequest.kb_total_loss
srpuserrequest.save()
logger.info("Approved SRP request id %s for character %s by user %s" % (
srp_request_id, srpuserrequest.character, request.user))
notify(
srpuserrequest.character.user,
'SRP Request Approved',
level='success',
message='Your SRP request for a %s lost during %s has been approved for %s ISK.' % (
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name, srpuserrequest.srp_total_amount)
)
if stored_fleet_view is None:
logger.error("Unable to approve srp request id %s on behalf of user %s - request matching id not found." % (
srp_request_id, request.user))
messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
return redirect("auth_srp_management_view")
else:
messages.success(request, _('Approved %(numrequests)s SRP requests') % {"numrequests": numrequests})
return redirect("auth_srp_fleet_view", stored_fleet_view)
@login_required
@permission_required('auth.srp_management')
def srp_request_reject(request, srp_request_id):
logger.debug("srp_request_reject called by user %s for srp request id %s" % (request.user, srp_request_id))
srpuserrequest = get_object_or_404(SrpUserRequest, id=srp_request_id)
srpuserrequest.srp_status = "Rejected"
srpuserrequest.save()
logger.info("SRP request id %s for character %s rejected by %s" % (
srp_request_id, srpuserrequest.character, request.user))
messages.success(request, _('Rejected SRP request from %(character)s for their %(ship)s.') % {
"character": srpuserrequest.character, "ship": srpuserrequest.srp_ship_name})
if srpuserrequest.character.userprofile:
notify(
srpuserrequest.character.userprofile.user,
'SRP Request Rejected',
level='danger',
message='Your SRP request for a %s lost during %s has been rejected.' % (
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name)
)
return redirect("auth_srp_fleet_view", srpuserrequest.srp_fleet_main.id)
def srp_request_reject(request):
numrequests = len(request.POST)-1
logger.debug("srp_request_reject called by user %s for %s srp request id's" % (request.user, numrequests))
stored_fleet_view = None
for srp_request_id in request.POST:
if numrequests == 0:
messages.warning(request, _("No SRP requests selected"))
return redirect("auth_srp_management_view")
if srp_request_id == "csrfmiddlewaretoken":
continue
if SrpUserRequest.objects.filter(id=srp_request_id).exists():
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.srp_status = "Rejected"
srpuserrequest.save()
logger.info("SRP request id %s for character %s rejected by %s" % (
srp_request_id, srpuserrequest.character, request.user))
notify(
srpuserrequest.character.user,
'SRP Request Rejected',
level='danger',
message='Your SRP request for a %s lost during %s has been rejected.' % (
srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name)
)
if stored_fleet_view is None:
logger.error("Unable to reject SRP request id %s on behalf of user %s - request matching id not found." % (
srp_request_id, request.user))
messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": srp_request_id})
return redirect("auth_srp_management_view")
else:
messages.success(request, _('Rejected %(numrequests)s SRP requests.') % {"numrequests": numrequests})
return redirect("auth_srp_fleet_view", stored_fleet_view)
@login_required
@permission_required('auth.srp_management')
def srp_request_update_amount_view(request, fleet_srp_request_id):
logger.debug("srp_request_update_amount_view called by user %s for fleet srp request id %s" % (
def srp_request_update_amount(request, fleet_srp_request_id):
logger.debug("srp_request_update_amount called by user %s for fleet srp request id %s" % (
request.user, fleet_srp_request_id))
srp_request = get_object_or_404(SrpUserRequest, id=fleet_srp_request_id)
if request.method == 'POST':
form = SrpFleetUpdateCostForm(request.POST)
logger.debug("Request type POST contains form valid: %s" % form.is_valid())
if form.is_valid():
srp_request.srp_total_amount = form.cleaned_data['srp_total_amount']
srp_request.save()
logger.info("Updated srp request id %s total to %s by user %s" % (
fleet_srp_request_id, intcomma(form.cleaned_data['srp_total_amount']), request.user))
messages.success(request, _('Updated SRP amount.'))
return redirect("auth_srp_fleet_view", srp_request.srp_fleet_main.id)
else:
logger.debug("Returning blank SrpFleetUpdateCostForm")
form = SrpFleetUpdateCostForm(initial={'srp_total_amount': srp_request.srp_total_amount or srp_request.kb_total_loss})
if SrpUserRequest.objects.filter(id=fleet_srp_request_id).exists() is False:
logger.error("Unable to locate SRP request id %s for user %s" % (fleet_srp_request_id, request.user))
messages.error(request, _('Unable to locate SRP request with ID %(requestid)s') % {"requestid": fleet_srp_request_id})
return redirect("auth_srp_management_view")
render_items = {'form': form}
return render(request, 'registered/srpfleetrequestamount.html', context=render_items)
srp_request = SrpUserRequest.objects.get(id=fleet_srp_request_id)
srp_request.srp_total_amount = request.POST['value']
srp_request.save()
logger.info("Updated srp request id %s total to %s by user %s" % (
fleet_srp_request_id, request.POST['value'], request.user))
return JsonResponse({"success":True,"pk":fleet_srp_request_id,"newValue":request.POST['value']})
@login_required