diff --git a/src/c3nav/access/forms.py b/src/c3nav/access/forms.py index c0c767fb..a19d785a 100644 --- a/src/c3nav/access/forms.py +++ b/src/c3nav/access/forms.py @@ -1,7 +1,7 @@ from django.forms import ModelForm, MultipleChoiceField from django.utils.translation import ugettext_lazy as _ -from c3nav.access.models import AccessToken +from c3nav.access.models import AccessToken, AccessUser from c3nav.mapdata.models import AreaLocation @@ -47,3 +47,9 @@ class AccessTokenForm(ModelForm): data = [':full'] data = ';'.join(data) return data + + +class AccessUserForm(ModelForm): + class Meta: + model = AccessUser + fields = ['user_url', 'description'] diff --git a/src/c3nav/access/migrations/0005_auto_20161225_1018.py b/src/c3nav/access/migrations/0005_auto_20161225_1018.py new file mode 100644 index 00000000..5c1c46f3 --- /dev/null +++ b/src/c3nav/access/migrations/0005_auto_20161225_1018.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2016-12-25 10:18 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0004_auto_20161223_2225'), + ] + + operations = [ + migrations.AlterField( + model_name='accessuser', + name='author', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='creator'), + ), + ] diff --git a/src/c3nav/access/models.py b/src/c3nav/access/models.py index d2b66000..6bf24c7a 100644 --- a/src/c3nav/access/models.py +++ b/src/c3nav/access/models.py @@ -31,7 +31,7 @@ class AccessOperator(models.Model): class AccessUser(models.Model): user_url = models.CharField(_('access name'), unique=True, max_length=200, help_text=_('Usually an URL to a profile somewhere')) - author = models.ForeignKey(AccessOperator, on_delete=models.PROTECT, null=True, blank=True, + author = models.ForeignKey(User, on_delete=models.PROTECT, null=True, blank=True, verbose_name=_('creator')) description = models.TextField(_('description'), max_length=200, blank=True) creation_date = models.DateTimeField(_('creation date'), auto_now_add=True) diff --git a/src/c3nav/access/templates/access/users.html b/src/c3nav/access/templates/access/users.html index 7d692b5d..39291560 100644 --- a/src/c3nav/access/templates/access/users.html +++ b/src/c3nav/access/templates/access/users.html @@ -49,4 +49,22 @@