Correct check if corputils is visible to user.

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

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...')}))

View File

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

View File

@ -1,5 +1,5 @@
# -*- 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 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')),
],
options={
'default_permissions': ('add', 'delete', 'view'),
'default_permissions': ('add', 'change', 'remove', 'view'),
'verbose_name': '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.')),

View File

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

View File

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