Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Error in Template Rendering

Browse Source
This commit is contained in:
orbitroom 2016-03-24 20:26:08 -04:00
parent 2f5d6d4871
commit ac5ee52ff8
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srp/views.py
View File

@ -213,13 +213,14 @@ def srp_request_view(request, fleet_srp):
character = EveManager.get_character_by_id(authinfo.main_char_id) character = EveManager.get_character_by_id(authinfo.main_char_id)
srp_fleet_main = SrpFleetMain.objects.get(fleet_srp_code=fleet_srp) srp_fleet_main = SrpFleetMain.objects.get(fleet_srp_code=fleet_srp)
post_time = timezone.now() post_time = timezone.now()
srp_status = "Pending"
srp_request = SrpUserRequest() srp_request = SrpUserRequest()
srp_request.killboard_link = form.cleaned_data['killboard_link'] srp_request.killboard_link = form.cleaned_data['killboard_link']
srp_request.additional_info = form.cleaned_data['additional_info'] srp_request.additional_info = form.cleaned_data['additional_info']
srp_request.character = character srp_request.character = character
srp_request.srp_fleet_main = srp_fleet_main srp_request.srp_fleet_main = srp_fleet_main
srp_request.srp_status = srp_status
try: try:
srp_kill_link = srpManager.get_kill_id(srp_request.killboard_link) srp_kill_link = srpManager.get_kill_id(srp_request.killboard_link)

23
stock/templates/registered/srpfleetdata.html
View File

@ -89,7 +89,28 @@
<button type="button" class="btn btn-success"><span <button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button> class="glyphicon glyphicon-ok"></span></button>
</a> </a>
{% else %} {% elif srpfleetrequest.srp_status == "Pending" %}
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% endif %}
{% if srpfleetrequest.srp_status == "Approved" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% elif srpfleetrequest.srp_status == "Pending" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}"> <a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span <button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button> class="glyphicon glyphicon-remove"></span></button>