phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix models

Browse Source
This commit is contained in:
Виктор Гладких 2019-10-08 10:18:51 +03:00
parent 7925febc77
commit e66a6bcbfa
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/account/admin.py
View File

@ -6,6 +6,16 @@ from django.utils.translation import ugettext_lazy as _
from account import models
@admin.register(models.Role)
class RoleAdmin(admin.ModelAdmin):
list_display = ['role', 'country', 'is_list', 'is_create', 'is_update', 'is_delete']
@admin.register(models.UserRole)
class UserRoleAdmin(admin.ModelAdmin):
list_display = ['user', 'role']
@admin.register(models.User)
class UserAdmin(BaseUserAdmin):
"""User model admin settings."""

4
apps/account/migrations/0009_role_userrole.py
View File

@ -1,4 +1,4 @@
# Generated by Django 2.2.4 on 2019-10-08 06:54
# Generated by Django 2.2.4 on 2019-10-08 07:17
from django.conf import settings
from django.db import migrations, models
@ -20,7 +20,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')),
('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
('role', models.CharField(choices=[(0, 'Guest'), (1, 'Standard user'), (2, 'Content page manager'), (3, 'Comments moderator')], max_length=250, verbose_name='Role')),
('role', models.PositiveIntegerField(choices=[(1, 'Standard user'), (2, 'Comments moderator')], verbose_name='Role')),
('is_list', models.BooleanField(default=True, verbose_name='list')),
('is_create', models.BooleanField(default=False, verbose_name='create')),
('is_update', models.BooleanField(default=False, verbose_name='update')),

8
apps/account/models.py
View File

@ -200,13 +200,11 @@ class User(AbstractUser):
class Role(ProjectBaseMixin):
ROLE_CHOICES =(
(0, 'Guest'),
(1, 'Standard user'),
(2, 'Content page manager'),
(3, 'Comments moderator'),
(2, 'Comments moderator'),
)
role = models.CharField(verbose_name=_('Role'), max_length=250,
choices=ROLE_CHOICES, null=False, blank=False)
role = models.PositiveIntegerField(verbose_name=_('Role'), choices=ROLE_CHOICES,
null=False, blank=False)
country = models.ForeignKey(Country, verbose_name=_('Country'), on_delete=models.CASCADE)
is_list = models.BooleanField(verbose_name=_('list'), default=True, null=False)
is_create = models.BooleanField(verbose_name=_('create'), default=False, null=False)