diff --git a/main/extra_func.py b/main/extra_func.py index d2f1810..3583867 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -181,7 +181,8 @@ def update_profile(user_profile: UserProfile) -> UserProfile: """ user = ZendeskAdmin().get_user(user_profile.user.email) user_profile.name = user.name - user_profile.role = user.custom_role_id if user.custom_role_id else 0 + user_profile.role = user.role + user_profile.custom_role_id = user.custom_role_id if user.custom_role_id else 0 user_profile.image = user.photo['content_url'] if user.photo else None user_profile.save() diff --git a/main/forms.py b/main/forms.py index 53eb63a..a8c2ec1 100644 --- a/main/forms.py +++ b/main/forms.py @@ -39,10 +39,11 @@ class AdminPageUsers(forms.Form): """ users = forms.ModelMultipleChoiceField( - queryset=UserProfile.objects.all(), + queryset=UserProfile.objects.filter(role='agent'), widget=forms.CheckboxSelectMultiple( attrs={ - 'class': 'form-check-input' + 'class': 'form-check-input', + } ), label='' diff --git a/main/migrations/0012_auto_20210312_1225.py b/main/migrations/0012_auto_20210312_1225.py new file mode 100644 index 0000000..6d33580 --- /dev/null +++ b/main/migrations/0012_auto_20210312_1225.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.6 on 2021-03-12 09:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0011_auto_20210311_1734'), + ] + + operations = [ + migrations.AddField( + model_name='userprofile', + name='custom_role_id', + field=models.IntegerField(default=0, help_text='Код роли пользователя'), + ), + migrations.AlterField( + model_name='userprofile', + name='role', + field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100), + ), + ] diff --git a/main/models.py b/main/models.py index 087784c..b202977 100644 --- a/main/models.py +++ b/main/models.py @@ -13,8 +13,9 @@ class UserProfile(models.Model): ('has_control_access', 'Can view admin page'), ) - user = models.OneToOneField(to=User, on_delete=models.CASCADE, help_text='Пользователь', related_name='user') - role = models.IntegerField(default=0, help_text='Код роли пользователя') + user = models.OneToOneField(to=User, on_delete=models.CASCADE, help_text='Пользователь') + role = models.CharField(default='None', max_length=100, help_text='Глобальное имя роли пользователя') + custom_role_id = models.IntegerField(default=0, help_text='Код роли пользователя') image = models.URLField(null=True, blank=True, help_text='Аватарка') name = models.CharField(default='None', max_length=100, help_text='Имя пользователя на нашем сайте') diff --git a/main/templates/base/menu.html b/main/templates/base/menu.html index a389341..92aaec1 100644 --- a/main/templates/base/menu.html +++ b/main/templates/base/menu.html @@ -3,10 +3,10 @@ - + - - Access Controller + + Access Controller {% if request.user.is_authenticated %} diff --git a/static/main/img/logo_real.png b/static/main/img/logo_real.png new file mode 100644 index 0000000..c602f15 Binary files /dev/null and b/static/main/img/logo_real.png differ