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

Removed all dependency on alliance membership

Browse Source 
Renamed permission 'alliance_member' 'member'
Renamed multiple variables in settings.py and associated handlers in util

Maybe it still works?
This commit is contained in:
Adarnof
2015-09-17 04:42:36 +00:00
parent e8181a23d7
commit e98bc36a9c
28 changed files with 115 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hrapplications/forms.py
View File

@@ -1,20 +1,10 @@
from django import forms
from django.conf import settings
from eveonline.models import EveCorporationInfo
class HRApplicationForm(forms.Form):
allchoices = []
for corp in EveCorporationInfo.objects.all():
if corp.alliance is not None:
if corp.alliance.alliance_id == settings.ALLIANCE_ID:
allchoices.append((str(corp.corporation_id), str(corp.corporation_name)))
character_name = forms.CharField(max_length=254, required=True, label="Main Character Name")
full_api_id = forms.CharField(max_length=254, required=True, label="API ID")
full_api_key = forms.CharField(max_length=254, required=True, label="API Verification Code")
corp = forms.ChoiceField(choices=allchoices, required=True, label="Corp")
is_a_spi = forms.ChoiceField(choices=[('Yes', 'Yes'), ('No', 'No')], required=True, label='Are you a spy?')
about = forms.CharField(widget=forms.Textarea, required=False, label="About You")
extra = forms.CharField(widget=forms.Textarea, required=False, label="Extra Application Info")
@@ -26,4 +16,4 @@ class HRApplicationCommentForm(forms.Form):
class HRApplicationSearchForm(forms.Form):
search_string = forms.CharField(max_length=254, required=True, label="Search String")
search_string = forms.CharField(max_length=254, required=True, label="Search String")

4
hrapplications/models.py
View File

@@ -1,7 +1,6 @@
from django.db import models
from django.contrib.auth.models import User
from eveonline.models import EveCorporationInfo
from eveonline.models import EveCharacter
@@ -13,7 +12,6 @@ class HRApplication(models.Model):
about = models.TextField(default="")
extra = models.TextField(default="")
corp = models.ForeignKey(EveCorporationInfo)
user = models.ForeignKey(User)
approved_denied = models.NullBooleanField(blank=True, null=True)
@@ -33,4 +31,4 @@ class HRApplicationComment(models.Model):
commenter_character = models.ForeignKey(EveCharacter)
def __str__(self):
return str(self.application.character_name) + " - Comment"
return str(self.application.character_name) + " - Comment"

7
hrapplications/views.py
View File

@@ -28,11 +28,11 @@ def hr_application_management_view(request):
# Get the corp the member is in
auth_info = AuthServicesInfo.objects.get(user=request.user)
if auth_info.main_char_id != "":
main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
if main_alliance_id == settings.ALLIANCE_ID:
main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
if main_corp_id == settings.CORP_ID:
main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
corp_applications = HRApplication.objects.filter(approved_denied=None)
else:
corp_applications = None
@@ -56,7 +56,6 @@ def hr_application_create_view(request):
application.character_name = form.cleaned_data['character_name']
application.full_api_id = form.cleaned_data['full_api_id']
application.full_api_key = form.cleaned_data['full_api_key']
application.corp = EveCorporationInfo.objects.get(corporation_id=form.cleaned_data['corp'])
application.is_a_spi = form.cleaned_data['is_a_spi']
application.about = form.cleaned_data['about']
application.extra = form.cleaned_data['extra']