From be8e2a40ee46fea0d6bde11dd064e2906f754ca6 Mon Sep 17 00:00:00 2001 From: Zambom Date: Mon, 19 Dec 2016 18:42:18 -0200 Subject: [PATCH] Changing user forms --- amadeus/roles.py | 19 ++++--------------- amadeus/settings.py | 1 + users/admin.py | 4 ++-- users/forms.py | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------- users/models.py | 12 ++++++------ users/views.py | 11 +++++------ 6 files changed, 88 insertions(+), 135 deletions(-) diff --git a/amadeus/roles.py b/amadeus/roles.py index 82e52b8..212433c 100644 --- a/amadeus/roles.py +++ b/amadeus/roles.py @@ -2,25 +2,14 @@ from rolepermissions.roles import AbstractUserRole class Student(AbstractUserRole): available_permissions = { - 'view_courses': True, - 'view_modules': True, - 'view_categories': True, - 'subscribe_course': True, } class Professor(AbstractUserRole): available_permissions = { - 'create_courses_record': True, - 'edit_courses_record': True, - 'delete_courses': True, - 'view_modules': True, - 'create_modules': True, - 'edit_modules': True, - 'delete_modules': True, - 'view_categories': True, - 'create_categories': True, - 'edit_categories': True, - 'delete_categories': True, + } + +class Coordinator(AbstractUserRole): + available_permissions = { } class SystemAdmin(AbstractUserRole): diff --git a/amadeus/settings.py b/amadeus/settings.py index e5a94ef..4e3f84c 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -53,6 +53,7 @@ INSTALLED_APPS = [ 'users', 'localization', + 'log', ] diff --git a/users/admin.py b/users/admin.py index 47dc1fc..453c8be 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,10 +1,10 @@ from django.contrib import admin from .models import User -from .forms import AdminUserForm +from .forms import UserForm class UserAdmin(admin.ModelAdmin): list_display = ['username', 'name', 'email', 'is_staff', 'is_active'] search_fields = ['username', 'name', 'email'] - form = AdminUserForm + form = UserForm admin.site.register(User, UserAdmin) diff --git a/users/forms.py b/users/forms.py index 1e59bf6..1d7d4de 100644 --- a/users/forms.py +++ b/users/forms.py @@ -9,7 +9,68 @@ from rolepermissions.shortcuts import assign_role from django.contrib.auth.forms import UserCreationForm from .models import User -class AdminUserForm(forms.ModelForm): +class Validation(forms.ModelForm): + def clean_email(self): + email = self.cleaned_data['email'] + + if User.objects.filter(email = email).exists(): + raise forms.ValidationError(_('There is already a registered User with this e-mail')) + + return email + + def validate_cpf(self, cpf): + cpf = ''.join(re.findall('\d', str(cpf))) + + if not cpf == '': + if cpfcnpj.validate(cpf): + return True + + return False + + return True + + def clean_cpf(self): + cpf = self.cleaned_data['cpf'] + + if not self.validate_cpf(cpf): + raise forms.ValidationError(_('Please enter a valid CPF')) + + return cpf + + def clean_birth_date(self): + birth_date = self.cleaned_data['birth_date'] + + if not birth_date is None: + if birth_date >= date.today(): + raise forms.ValidationError(_('Please enter a valid date')) + + return birth_date + +class ValidationRegister(Validation): + def clean_password(self): + password = self.cleaned_data.get('password') + + # At least MIN_LENGTH long + if len(password) < self.MIN_LENGTH: + raise forms.ValidationError(_("The password must contain at least % d characters." % self.MIN_LENGTH)) + + # At least one letter and one non-letter + first_isalpha = password[0].isalpha() + if all(c.isalpha() == first_isalpha for c in password): + raise forms.ValidationError(_('The password must contain at least one letter and at least one digit or a punctuation character.')) + + return password + + def clean_password2(self): + password = self.cleaned_data.get("password") + password2 = self.cleaned_data.get("password2") + + if password and password2 and password != password2: + raise forms.ValidationError(_('The confirmation password is incorrect.')) + + return password2 + +class UserForm(Validation): def save(self, commit=True): super(AdminUserForm, self).save(commit=False) @@ -22,6 +83,8 @@ class AdminUserForm(forms.ModelForm): assign_role(self.instance, 'student') elif self.instance.type_profile == 1: assign_role(self.instance, 'professor') + elif self.instance.type_profile == 3: + assign_role(self.instance, 'coordinator') self.instance.save() @@ -36,125 +99,26 @@ class AdminUserForm(forms.ModelForm): 'password':forms.PasswordInput } -class RegisterUserForm(forms.ModelForm): - +class RegisterUserForm(ValidationRegister): password = forms.CharField(label=_('Password'), widget=forms.PasswordInput) password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput) - # birth_date = forms.DateField(widget=forms.SelectDateWidget()) - MIN_LENGTH = 8 - - def validate_cpf(self, cpf): - cpf = ''.join(re.findall('\d', str(cpf))) - - if cpfcnpj.validate(cpf): - return True - return False - - def clean_email(self): - email = self.cleaned_data['email'] - if User.objects.filter(email = email).exists(): - raise forms.ValidationError(_('There is already a registered User with this e-mail')) - return email - - def clean_birth_date(self): - birth_date = self.cleaned_data['birth_date'] - if birth_date >= date.today(): - raise forms.ValidationError(_('Please enter a valid date')) - return birth_date - - - def clean_cpf(self): - cpf = self.cleaned_data['cpf'] - if (cpf == ""): - return cpf - if User.objects.filter(cpf = cpf).exists(): - raise forms.ValidationError(_('There is already a registered User with this CPF')) - if not self.validate_cpf(cpf): - raise forms.ValidationError(_('Please enter a valid CPF')) - return cpf - def clean_password(self): - password = self.cleaned_data.get('password') - - # At least MIN_LENGTH long - if len(password) < self.MIN_LENGTH: - raise forms.ValidationError(_("The password must contain at least % d characters." % self.MIN_LENGTH)) - - # At least one letter and one non-letter - first_isalpha = password[0].isalpha() - if all(c.isalpha() == first_isalpha for c in password): - raise forms.ValidationError(_('The password must contain at least one letter and at least one digit or '\ - "a punctuation character.")) - - return password - - def clean_password2(self): - password = self.cleaned_data.get("password") - password2 = self.cleaned_data.get("password2") - - if password and password2 and password != password2: - raise forms.ValidationError(_('The confirmation password is incorrect.')) - return password2 + MIN_LENGTH = 8 def save(self, commit=True): super(RegisterUserForm, self).save(commit=False) + self.instance.set_password(self.cleaned_data['password']) self.instance.save() + return self.instance class Meta: model = User - # exclude = ['is_staff', 'is_active'] - fields = ['username', 'name', 'email', 'city', 'state', 'gender', 'cpf', 'birth_date', 'phone', 'image', 'titration', - 'year_titration', 'institution', 'curriculum',] - -class UserForm(RegisterUserForm): - - class Meta: - model = User - fields = ['username', 'name', 'email', 'birth_date', 'city', - 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', - 'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active'] - -class UpdateUserForm(forms.ModelForm): - - def validate_cpf(self, cpf): - cpf = ''.join(re.findall('\d', str(cpf))) - - if cpfcnpj.validate(cpf): - return True - return False - - def clean_cpf(self): - cpf = self.cleaned_data['cpf'] - if not self.validate_cpf(cpf): - raise forms.ValidationError(_('Please enter a valid CPF')) - return cpf - - def clean_birth_date(self): - birth_date = self.cleaned_data['birth_date'] - if birth_date >= date.today(): - raise forms.ValidationError(_('Please enter a valid date')) - return birth_date - - class Meta: - model = User - fields = ['username', 'name', 'email', 'birth_date', 'city', - 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', - 'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active'] - - - -class UpdateProfileFormAdmin(UpdateUserForm): - - class Meta: - model = User - fields = ['username', 'name', 'email', 'birth_date', 'city', - 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', - 'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active'] + fields = ['username', 'name', 'email',] -class UpdateProfileForm(UpdateUserForm): +class UpdateProfileForm(Validation): class Meta: model = User diff --git a/users/models.py b/users/models.py index 9e084f1..889ba16 100644 --- a/users/models.py +++ b/users/models.py @@ -26,7 +26,7 @@ class User(AbstractBaseUser, PermissionsMixin): birth_date = models.DateField(_('Birth Date'), null=True, blank=True) phone = models.CharField(_('Phone'), max_length = 30, blank = True) cpf = models.CharField(_('CPF'), max_length = 15, blank=True, null=True) - type_profile = models.IntegerField(_('Type'), null = True, blank = True, choices = ((1, _('Professor')), (2, _('Student')))) + type_profile = models.IntegerField(_('Type'), null = True, blank = True, choices = ((1, _('Professor')), (2, _('Student')), (3, _('Coordinator')))) titration = models.CharField(_('Titration'), max_length = 50, blank = True, null = True) year_titration = models.CharField(_('Year of titration'), max_length = 4, blank = True, null = True) institution = models.CharField(_('Institution'), max_length = 50, blank=True, null=True) @@ -36,7 +36,7 @@ class User(AbstractBaseUser, PermissionsMixin): is_active = models.BooleanField(_('Active'), default = True) USERNAME_FIELD = 'username' - REQUIRED_FIELDS = ['email', 'cpf'] + REQUIRED_FIELDS = ['email'] objects = UserManager() @@ -47,11 +47,11 @@ class User(AbstractBaseUser, PermissionsMixin): def __str__(self): return self.name or self.username - def get_full_name(self): - return str(self) + def save(self, *args, **kwargs): + if not self.is_staff and self.type_profile is None: + self.type_profile = 2 - def get_short_name(self): - return str(self).split(" ")[0] + super(User, self).save(*args, **kwargs) @property def image_url(self): diff --git a/users/views.py b/users/views.py index 3cf4aa4..94dedc8 100644 --- a/users/views.py +++ b/users/views.py @@ -12,7 +12,7 @@ from itertools import chain from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from .models import User -from .forms import UserForm, UpdateProfileForm, UpdateUserForm, UpdateProfileFormAdmin +from .forms import UserForm, UpdateProfileForm #API IMPORTS @@ -85,7 +85,7 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView): slug_url_kwarg = 'username' context_object_name = 'acc' model = User - form_class = UpdateUserForm + form_class = UserForm success_url = reverse_lazy('users:manage') def form_valid(self, form): @@ -165,10 +165,9 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView): def get_context_data(self, **kwargs): context = super(UpdateProfile, self).get_context_data(**kwargs) context['title'] = 'Update Profile' - if has_role(self.request.user, 'system_admin'): - context['form'] = UpdateProfileFormAdmin(instance = self.object) - else: - context['form'] = UpdateProfileForm(instance = self.object) + + context['form'] = UpdateProfileForm(instance = self.object) + return context def form_valid(self, form): -- libgit2 0.21.2