trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch '37-guardian' into 'master'

Browse source 
Resolve "Guardian"

Closes #37

See merge request BeryJu.org/passbook!23
This commit is contained in:
Jens Langhammer 2019-04-13 15:56:54 +00:00
parent dda41af5c8 e7129d18f6
commit 5029a99df6
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
passbook/core/migrations/0023_remove_user_applications.py Normal file
View file

@ -0,0 +1,17 @@
# Generated by Django 2.2 on 2019-04-13 15:51
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('passbook_core', '0022_nonce_expiring'),
]
operations = [
migrations.RemoveField(
model_name='user',
name='applications',
),
]

1
passbook/core/models.py
View file

@ -47,7 +47,6 @@ class User(AbstractUser):
name = models.TextField() name = models.TextField()
sources = models.ManyToManyField('Source', through='UserSourceConnection') sources = models.ManyToManyField('Source', through='UserSourceConnection')
applications = models.ManyToManyField('Application')
groups = models.ManyToManyField('Group') groups = models.ManyToManyField('Group')
password_change_date = models.DateTimeField(auto_now_add=True) password_change_date = models.DateTimeField(auto_now_add=True)

1
passbook/core/requirements.txt
View file

@ -1,5 +1,6 @@
celery celery
colorlog colorlog
django-guardian
django-ipware django-ipware
django-model-utils django-model-utils
django-redis django-redis

4
passbook/core/settings.py
View file

@ -58,7 +58,8 @@ SESSION_CACHE_ALIAS = "default"
LANGUAGE_COOKIE_NAME = 'passbook_language' LANGUAGE_COOKIE_NAME = 'passbook_language'
AUTHENTICATION_BACKENDS = [ AUTHENTICATION_BACKENDS = [
'django.contrib.auth.backends.ModelBackend' 'django.contrib.auth.backends.ModelBackend',
'guardian.backends.ObjectPermissionBackend',
] ]
# Application definition # Application definition
@ -73,6 +74,7 @@ INSTALLED_APPS = [
'django.contrib.postgres', 'django.contrib.postgres',
'rest_framework', 'rest_framework',
'drf_yasg', 'drf_yasg',
'guardian',
'passbook.core.apps.PassbookCoreConfig', 'passbook.core.apps.PassbookCoreConfig',
'passbook.admin.apps.PassbookAdminConfig', 'passbook.admin.apps.PassbookAdminConfig',
'passbook.api.apps.PassbookAPIConfig', 'passbook.api.apps.PassbookAPIConfig',

8
passbook/core/views/overview.py
View file

@ -2,8 +2,7 @@
from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic import TemplateView from django.views.generic import TemplateView
from guardian.shortcuts import get_objects_for_user
from passbook.core.models import Application
class OverviewView(LoginRequiredMixin, TemplateView): class OverviewView(LoginRequiredMixin, TemplateView):
@ -13,7 +12,6 @@ class OverviewView(LoginRequiredMixin, TemplateView):
template_name = 'overview/index.html' template_name = 'overview/index.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs['applications'] = self.request.user.applications.all() kwargs['applications'] = get_objects_for_user(self.request.user,
if self.request.user.is_superuser: 'passbook_core.view_application')
kwargs['applications'] = Application.objects.all()
return super().get_context_data(**kwargs) return super().get_context_data(**kwargs)