[Update] 修改创建按钮样式；Open 数据库应用；取消资产/系统用户/组织等名称对于特殊字符的限制； (#3594)

* [Update] 修改创建按钮样式

* [Update] Open数据库应用

* [Update] 取消资产/系统用户/组织等名称对于特殊字符的限制

apps/applications/templates/applications/database_app_list.html

@@ -5,10 +5,9 @@
 {% block table_search %}{% endblock %}
 {% block table_container %}
     <div class="btn-group uc pull-left m-r-5">
-        <button class="btn btn-sm btn-primary">
+        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
             {% trans "Create DatabaseApp" %}
-        </button>
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle"><span class="caret"></span></button>
+            <span class="caret"></span></button>
         <ul class="dropdown-menu">
             {% for key, value in type_choices %}
                 <li><a class="" href="{% url 'applications:database-app-create' %}?type={{ key }}">{{ value }}</a></li>

apps/applications/templates/applications/remote_app_list.html

@@ -7,10 +7,9 @@
 {% block table_search %}{% endblock %}
 {% block table_container %}
     <div class="btn-group uc pull-left m-r-5">
-        <button class="btn btn-sm btn-primary">
+        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
             {% trans "Create RemoteApp" %}
-        </button>
-        <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle"><span class="caret"></span></button>
+            <span class="caret"></span></button>
         <ul class="dropdown-menu">
             {% for key, value in type_choices %}
                 <li><a class="" href="{% url 'applications:remote-app-create' %}?type={{ key }}">{{ value }}</a></li>

apps/assets/const.py

 # -*- coding: utf-8 -*-
 #
-
-from django.utils.translation import ugettext_lazy as _
-
-
-GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT = _(
-    'Cannot contain special characters: [ {} ]'
-).format(" ".join(['/', '\\']))
-
-GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN = r"[/\\]"
-
-GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG = \
-    _("* The contains characters that are not allowed")

apps/assets/forms/asset.py

@@ -7,7 +7,6 @@ from common.utils import get_logger
 from orgs.mixins.forms import OrgModelForm
 
 from ..models import Asset
-from ..const import GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT
 
 
 logger = get_logger(__file__)
@@ -82,7 +81,6 @@ class AssetCreateUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT,
             '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'

apps/assets/forms/user.py

@@ -6,7 +6,6 @@ from django.utils.translation import gettext_lazy as _
 from common.utils import validate_ssh_private_key, ssh_pubkey_gen, get_logger
 from orgs.mixins.forms import OrgModelForm
 from ..models import AdminUser, SystemUser
-from ..const import GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT
 
 logger = get_logger(__file__)
 __all__ = [
@@ -99,7 +98,6 @@ class SystemUserForm(OrgModelForm, PasswordAndKeyAuthForm):
             }),
         }
         help_texts = {
-            'name': GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_HELP_TEXT,
             '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/assets/serializers/asset.py

@@ -8,10 +8,6 @@ from django.utils.translation import ugettext_lazy as _
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from common.serializers import AdaptedBulkListSerializer
 from ..models import Asset, Node, Label, Platform
-from ..const import (
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-)
 from .base import ConnectivitySerializer
 
 __all__ = [
@@ -100,15 +96,6 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
             'org_name': {'label': _('Org name')}
         }
 
-    @staticmethod
-    def validate_hostname(hostname):
-        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
-        res = re.search(pattern, hostname)
-        if res is not None:
-            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-            raise serializers.ValidationError(msg)
-        return hostname
-
     @classmethod
     def setup_eager_loading(cls, queryset):
         """ Perform necessary eager loading of data. """

apps/assets/serializers/system_user.py

@@ -9,10 +9,6 @@ from common.utils import ssh_pubkey_gen
 from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from assets.models import Node
 from ..models import SystemUser
-from ..const import (
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-)
 from .base import AuthSerializer, AuthSerializerMixin
 
 __all__ = [
@@ -47,15 +43,6 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
             'created_by': {'read_only': True},
         }
 
-    @staticmethod
-    def validate_name(name):
-        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
-        res = re.search(pattern, name)
-        if res is not None:
-            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-            raise serializers.ValidationError(msg)
-        return name
-
     def validate_auto_push(self, value):
         login_mode = self.initial_data.get("login_mode")
         protocol = self.initial_data.get("protocol")

apps/orgs/serializers.py

@@ -4,10 +4,6 @@ from rest_framework.serializers import ModelSerializer
 from rest_framework import serializers
 from users.models import User, UserGroup
 from assets.models import Asset, Domain, AdminUser, SystemUser, Label
-from assets.const import (
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN,
-    GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-)
 from perms.models import AssetPermission
 from common.serializers import AdaptedBulkListSerializer
 from .utils import set_current_org, get_current_org
@@ -22,15 +18,6 @@ class OrgSerializer(ModelSerializer):
         fields = '__all__'
         read_only_fields = ['created_by', 'date_created']
 
-    @staticmethod
-    def validate_name(name):
-        pattern = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_PATTERN
-        res = re.search(pattern, name)
-        if res is not None:
-            msg = GENERAL_FORBIDDEN_SPECIAL_CHARACTERS_ERROR_MSG
-            raise serializers.ValidationError(msg)
-        return name
-
 
 class OrgReadSerializer(ModelSerializer):
     admins = serializers.SlugRelatedField(slug_field='name', many=True, read_only=True)

apps/templates/_nav.html

@@ -54,13 +54,15 @@
 
 
 {# Applications #}
-{% if request.user.can_admin_current_org and LICENSE_VALID %}
+{% if request.user.can_admin_current_org %}
     <li id="applications">
         <a>
             <i class="fa fa-th" style="width: 14px"></i> <span class="nav-label">{% trans 'Applications' %}</span><span class="fa arrow"></span>
         </a>
         <ul class="nav nav-second-level">
+            {% if LICENSE_VALID %}
             <li id="remote-app"><a href="{% url 'applications:remote-app-list' %}">{% trans 'RemoteApp' %}</a></li>
+            {% endif %}
             <li id="database-app"><a href="{% url 'applications:database-app-list' %}">{% trans 'DatabaseApp' %}</a></li>
         </ul>
     </li>
@@ -79,10 +81,10 @@
             <li id="remote-app-permission">
                 <a href="{% url 'perms:remote-app-permission-list' %}">{% trans 'RemoteApp' %}</a>
             </li>
+            {% endif %}
             <li id="database-app-permission">
                 <a href="{% url 'perms:database-app-permission-list' %}">{% trans 'DatabaseApp' %}</a>
             </li>
-            {% endif %}
         </ul>
     </li>
 {% endif %}

apps/templates/_nav_user.html

@@ -5,17 +5,18 @@
     </a>
 </li>
 
-{% if LICENSE_VALID %}
 <li id="applications">
     <a>
         <i class="fa fa-th" style="width: 14px"></i> <span class="nav-label">{% trans 'My Applications' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
+        {% if LICENSE_VALID %}
         <li id="user-remote-app">
             <a href="{% url 'applications:user-remote-app-list' %}">
                 <i class="" style="width: 14px"></i><span class="nav-label">{% trans 'RemoteApp' %}</span><span class="label label-info pull-right"></span>
             </a>
         </li>
+        {% endif %}
         <li id="user-database-app">
             <a href="{% url 'applications:user-database-app-list' %}">
                 <i class="" style="width: 14px"></i><span class="nav-label">{% trans 'DatabaseApp' %}</span><span class="label label-info pull-right"></span>
@@ -23,7 +24,6 @@
         </li>
     </ul>
 </li>
-{% endif %}
 
 {% if SECURITY_COMMAND_EXECUTION %}
 <li id="ops">

apps/terminal/templates/terminal/base_storage_list.html

@@ -13,10 +13,9 @@
                     <div id="my-tickets" class="tab-pane active">
                         <div class="panel-body">
                             <div class="btn-group uc pull-left m-r-5">
-                                <button class="btn btn-sm btn-primary">
+                                <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle">
                                     {% block create_storage_info %}{% endblock %}
-                                </button>
-                                <button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle"><span class="caret"></span></button>
+                                    <span class="caret"></span></button>
                                 <ul class="dropdown-menu">
                                 {% for key, value in type_choices %}
                                     <li><a class="" href="{% block create_storage_url %}{% endblock %}?type={{ key }}">{{ value }}</a></li>