mirror of https://github.com/jumpserver/jumpserver
				
				
				
			[Update] system user form add label
							parent
							
								
									72a82c41ee
								
							
						
					
					
						commit
						a4d02adb22
					
				| 
						 | 
				
			
			@ -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',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 <a href="{url}">{name}</a> 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'),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue