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

Correct check if corputils is visible to user.

Browse Source 
Add additional admin site permissions.
This commit is contained in:
Adarnof 2016-12-13 17:30:06 -05:00
parent 3d92e4c5c5
commit 6fd3c32ba0
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
corputils/forms.py
View File

@ -1,8 +0,0 @@
from __future__ import unicode_literals
from django import forms
from django.utils.translation import ugettext_lazy as _
class CorputilsSearchForm(forms.Form):
search_string = forms.CharField(max_length=254, required=True, label="",
widget=forms.TextInput(attrs={'placeholder': _('Search characters...')}))

9
corputils/managers.py
View File

@ -12,14 +12,13 @@ class CorpStatsQuerySet(models.QuerySet):
auth = AuthServicesInfo.objects.get_or_create(user=user)[0] auth = AuthServicesInfo.objects.get_or_create(user=user)[0]
try: try:
char = EveCharacter.objects.get(character_id=auth.main_char_id) char = EveCharacter.objects.get(character_id=auth.main_char_id)
# build all accepted queries # build all accepted queries
queries = [] queries = []
if user.has_perm('corpstats.corp_apis'): if user.has_perm('corputils.corp_apis'):
queries.append(models.Q(corp__corporation_id=char.corporation_id)) queries.append(models.Q(corp__corporation_id=char.corporation_id))
if user.has_perm('corpstats.alliance_apis'): if user.has_perm('corputils.alliance_apis'):
queries.append(models.Q(corp__alliance_id=char.alliance_id)) queries.append(models.Q(corp__alliance__alliance_id=char.alliance_id))
if user.has_perm('corpstats.blue_apis'): if user.has_perm('corputils.blue_apis'):
queries.append(models.Q(corp__is_blue=True)) queries.append(models.Q(corp__is_blue=True))
# filter based on queries # filter based on queries

4
corputils/migrations/0001_initial.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.10.1 on 2016-12-13 21:24 # Generated by Django 1.10.1 on 2016-12-13 22:24
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@ -26,7 +26,7 @@ class Migration(migrations.Migration):
('token', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='esi.Token')), ('token', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='esi.Token')),
], ],
options={ options={
'default_permissions': ('add', 'delete', 'view'), 'default_permissions': ('add', 'change', 'remove', 'view'),
'verbose_name': 'corp stats', 'verbose_name': 'corp stats',
'verbose_name_plural': 'corp stats', 'verbose_name_plural': 'corp stats',
'permissions': (('corp_apis', 'Can view API keys of members of their corporation.'), ('alliance_apis', 'Can view API keys of members of their alliance.'), ('blue_apis', 'Can view API keys of members of blue corporations.')), 'permissions': (('corp_apis', 'Can view API keys of members of their corporation.'), ('alliance_apis', 'Can view API keys of members of their alliance.'), ('blue_apis', 'Can view API keys of members of blue corporations.')),

3
corputils/models.py
View File

@ -29,7 +29,8 @@ class CorpStats(models.Model):
) )
default_permissions = ( default_permissions = (
'add', 'add',
'delete', 'change',
'remove',
'view', 'view',
) )
verbose_name = "corp stats" verbose_name = "corp stats"

1
corputils/views.py
View File

@ -9,7 +9,6 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.conf import settings from django.conf import settings
from eveonline.models import EveCharacter, EveCorporationInfo from eveonline.models import EveCharacter, EveCorporationInfo
from corputils.models import CorpStats from corputils.models import CorpStats
from corputils.forms import CorputilsSearchForm
from esi.decorators import token_required from esi.decorators import token_required
MEMBERS_PER_PAGE = int(getattr(settings, 'CORPSTATS_MEMBERS_PER_PAGE', 20)) MEMBERS_PER_PAGE = int(getattr(settings, 'CORPSTATS_MEMBERS_PER_PAGE', 20))