Required opt (#2246)

* [Update] 修改心跳偶人时间

* [Update] 去掉required的label

* [Update] 修改默认心跳时间

* [Update] 去掉默认的placeholder

* [Update] 修改utils

apps/assets/forms/asset.py

@@ -41,9 +41,6 @@ class AssetCreateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': '* required',
-            'ip': '* required',
-            'port': '* required',
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -80,10 +77,6 @@ class AssetUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': '* required',
-            'ip': '* required',
-            'port': '* required',
-            'cluster': '* required',
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -95,7 +88,7 @@ class AssetUpdateForm(OrgModelForm):
 
 class AssetBulkUpdateForm(OrgModelForm):
     assets = forms.ModelMultipleChoiceField(
-        required=True, help_text='* required',
+        required=True,
         label=_('Select assets'), queryset=Asset.objects.all(),
         widget=forms.SelectMultiple(
             attrs={

apps/assets/forms/domain.py

@@ -61,7 +61,3 @@ class GatewayForm(PasswordAndKeyAuthForm, OrgModelForm):
             'name': forms.TextInput(attrs={'placeholder': _('Name')}),
             'username': forms.TextInput(attrs={'placeholder': _('Username')}),
         }
-        help_texts = {
-            'name': '* required',
-            'username': '* required',
-        }

apps/assets/forms/user.py

@@ -80,10 +80,6 @@ class AdminUserForm(PasswordAndKeyAuthForm):
             'name': forms.TextInput(attrs={'placeholder': _('Name')}),
             'username': forms.TextInput(attrs={'placeholder': _('Username')}),
         }
-        help_texts = {
-            'name': '* required',
-            'username': '* required',
-        }
 
 
 class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
@@ -150,7 +146,6 @@ class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
             }),
         }
         help_texts = {
-            'name': '* required',
             'auto_push': _('Auto push system user to asset'),
             'priority': _('1-100, High level will be using login asset as default, '
                           'if user was granted more than 2 system user'),

apps/common/templates/common/command_storage_create.html

@@ -41,7 +41,6 @@
                                 <label class="col-md-2 control-label" for="id_name">{% trans "Name" %}</label>
                                 <div class="col-md-9">
                                     <input id="id_name" class="form-control" type="text" name="NAME" value="">
-                                    <div class="help-block">* required</div>
                                     <div id="id_error" style="color: red;"></div>
                                 </div>
                             </div>

apps/common/templates/common/replay_storage_create.html

@@ -44,7 +44,6 @@
                                 <label class="col-md-2 control-label" for="id_name">{% trans "Name" %}</label>
                                 <div class="col-md-9">
                                     <input id="id_name" class="form-control" type="text" name="NAME" value="">
-                                    <div class="help-block">* required</div>
                                     <div id="id_error" style="color: red;"></div>
                                 </div>
                             </div>

apps/jumpserver/conf.py

@@ -316,7 +316,7 @@ defaults = {
     'EMAIL_SUFFIX': 'jumpserver.org',
     'TERMINAL_PASSWORD_AUTH': True,
     'TERMINAL_PUBLIC_KEY_AUTH': True,
-    'TERMINAL_HEARTBEAT_INTERVAL': 5,
+    'TERMINAL_HEARTBEAT_INTERVAL': 20,
     'TERMINAL_ASSET_LIST_SORT_BY': 'hostname',
     'TERMINAL_ASSET_LIST_PAGE_SIZE': 'auto',
     'TERMINAL_SESSION_KEEP_DURATION': 9999,

apps/jumpserver/settings.py

@@ -499,8 +499,9 @@ BOOTSTRAP3 = {
     # Field class to use in horizontal forms
     'horizontal_field_class': 'col-md-9',
     # Set placeholder attributes to label if no placeholder is provided
-    'set_placeholder': True,
+    'set_placeholder': False,
     'success_css_class': '',
+    'required_css_class': 'required',
 }
 
 TOKEN_EXPIRATION = CONFIG.TOKEN_EXPIRATION

apps/perms/utils.py

@@ -18,8 +18,7 @@ class GenerateTree:
             "asset_instance": set("system_user")
         }
         """
-        self.__all_nodes = Node.objects.all()
-        self.__node_asset_map = defaultdict(set)
+        self.__all_nodes = list(Node.objects.all())
         self.nodes = defaultdict(dict)
 
     def add_asset(self, asset, system_users):

apps/static/css/jumpserver.css

@@ -438,4 +438,7 @@ div.dataTables_wrapper div.dataTables_filter {
     white-space: nowrap;
 }
 
-
+.form-group .required .control-label:after {
+    content:"*";
+    color:red;
+}

apps/users/forms.py

@@ -63,11 +63,6 @@ class UserCreateUpdateForm(OrgModelForm):
             'username', 'name', 'email', 'groups', 'wechat',
             'phone', 'role', 'date_expired', 'comment', 'otp_level'
         ]
-        help_texts = {
-            'username': '* required',
-            'name': '* required',
-            'email': '* required',
-        }
         widgets = {
             'otp_level': forms.RadioSelect(),
             'groups': forms.SelectMultiple(
@@ -141,11 +136,6 @@ class UserProfileForm(forms.ModelForm):
             'username', 'name', 'email',
             'wechat', 'phone',
         ]
-        help_texts = {
-            'username': '* required',
-            'name': '* required',
-            'email': '* required',
-        }
 
 
 UserProfileForm.verbose_name = _("Profile")
@@ -263,7 +253,6 @@ UserPublicKeyForm.verbose_name = _("Public key")
 class UserBulkUpdateForm(OrgModelForm):
     users = forms.ModelMultipleChoiceField(
         required=True,
-        help_text='* required',
         label=_('Select users'),
         queryset=User.objects.all(),
         widget=forms.SelectMultiple(
@@ -346,9 +335,6 @@ class UserGroupForm(OrgModelForm):
         fields = [
             'name', 'users', 'comment',
         ]
-        help_texts = {
-            'name': '* required'
-        }
 
 
 class FileForm(forms.Form):