diff --git a/apps/users/forms.py b/apps/users/forms.py index 85bfdd0b5..5ff6407fd 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -13,9 +13,17 @@ class UserAddForm(ModelForm): 'username', 'name', 'email', 'groups', 'wechat', 'phone', 'enable_2FA', 'role', 'date_expired', 'comment', ] - # widgets = { - # 'groups': forms.SelectMultiple(attrs={'class': 'chosen-select'}) - # } + + help_texts = { + 'username': '* required', + 'name': '* required', + 'email': '* required', + 'groups': '* required' + } + + widgets = { + 'groups': forms.SelectMultiple(attrs={'class': 'chosen-select', 'data-placeholder': '请选择用户组'}) + } class UserUpdateForm(ModelForm): @@ -26,6 +34,13 @@ class UserUpdateForm(ModelForm): 'phone', 'enable_2FA', 'role', 'date_expired', 'comment', ] + help_texts = { + 'username': '* required', + 'name': '* required', + 'email': '* required', + 'groups': '* required' + } + class UserGroupForm(ModelForm): class Meta: @@ -33,3 +48,6 @@ class UserGroupForm(ModelForm): fields = [ 'name', 'comment', ] + help_texts = { + 'name': '* required' + } diff --git a/apps/users/models.py b/apps/users/models.py index 0da7da312..326a8df55 100644 --- a/apps/users/models.py +++ b/apps/users/models.py @@ -75,7 +75,7 @@ class UserGroup(models.Model): class User(AbstractUser): - username = models.CharField(max_length=20, unique=True, verbose_name='用户名', help_text='* required') + username = models.CharField(max_length=20, unique=True, verbose_name='用户名') name = models.CharField(max_length=20, verbose_name='姓名', help_text='* required') email = models.EmailField(max_length=30, unique=True, verbose_name='邮件', help_text='* required') groups = models.ManyToManyField(UserGroup, verbose_name='用户组', help_text='* required') diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html index 0c4339043..74d493a39 100644 --- a/apps/users/templates/users/_user.html +++ b/apps/users/templates/users/_user.html @@ -3,7 +3,7 @@ {% load bootstrap %} {% block custom_head_css_js %} - + {% endblock %} {% block content %} @@ -67,18 +67,18 @@ {% endblock %} {% block custom_foot_js %} - + {% endblock %} \ No newline at end of file diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 4e028978b..5701e322a 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -24,7 +24,7 @@
添加用户 删除所选 -