diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 3ff8bb900..68aaddc43 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -258,9 +258,10 @@ class SystemUserForm(forms.ModelForm): # Admin user assets define, let user select, save it in form not in view auto_generate_key = forms.BooleanField(initial=True, required=False) # Form field name can not start with `_`, so redefine it, - password = forms.CharField(widget=forms.PasswordInput, required=False, max_length=128, strip=True) + password = forms.CharField(widget=forms.PasswordInput, required=False, + max_length=128, strip=True, label=_("Password")) # Need use upload private key file except paste private key content - private_key_file = forms.FileField(required=False) + private_key_file = forms.FileField(required=False, label=_("Private key")) def save(self, commit=True): # Because we define custom field, so we need rewrite :method: `save` @@ -307,8 +308,11 @@ class SystemUserForm(forms.ModelForm): 'name': forms.TextInput(attrs={'placeholder': _('Name')}), 'username': forms.TextInput(attrs={'placeholder': _('Username')}), 'cluster': forms.SelectMultiple( - attrs={'class': 'select2', - 'data-placeholder': _(' Select clusters')}), + attrs={ + 'class': 'select2', + 'data-placeholder': _(' Select clusters') + } + ), } help_texts = { 'name': '* required', diff --git a/apps/assets/views/system_user.py b/apps/assets/views/system_user.py index 6fdd8825d..f7e7eaa35 100644 --- a/apps/assets/views/system_user.py +++ b/apps/assets/views/system_user.py @@ -1,8 +1,6 @@ # ~*~ coding: utf-8 ~*~ -from django.shortcuts import reverse from django.utils.translation import ugettext as _ -from django.db import transaction from django.views.generic import TemplateView from django.views.generic.edit import CreateView, DeleteView, UpdateView from django.urls import reverse_lazy diff --git a/apps/users/views/user.py b/apps/users/views/user.py index 89ed460bb..6b86ddc1b 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -329,17 +329,10 @@ class UserProfileUpdateView(LoginRequiredMixin, UpdateView): model = User form_class = forms.UserProfileForm success_url = reverse_lazy('users:user-profile') - success_message = _('Create user {name} successfully.') def get_object(self, queryset=None): return self.request.user - def get_success_message(self, cleaned_data): - url = reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}) - return self.success_message.format( - url=url, name=self.object.name - ) - def get_context_data(self, **kwargs): context = { 'app': _('User'),