[Update] 修改dictfiled

apps/common/fields.py

@@ -5,6 +5,7 @@ import json
 from django import forms
 from django.utils import six
 from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext as _
 
 
 class DictField(forms.Field):
@@ -21,12 +22,13 @@ class DictField(forms.Field):
                 value = json.loads(value)
                 return value
             except json.JSONDecodeError:
-                pass
+                return ValidationError(_("Not a valid json"))
-        value = {}
+        else:
-        return value
+            return ValidationError(_("Not a string type"))
 
     def validate(self, value):
-        print(value)
+        if isinstance(value, ValidationError):
+            raise value
         if not value and self.required:
             raise ValidationError(self.error_messages['required'], code='required')
 

apps/common/forms.py

@@ -26,7 +26,7 @@ def to_form_value(value):
             data = value
         return data
     except json.JSONDecodeError:
-        return ''
+        return ""
 
 
 class BaseForm(forms.Form):
@@ -39,7 +39,7 @@ class BaseForm(forms.Form):
             if db_value is False or db_value:
                 field.initial = to_form_value(db_value)
             elif django_value is False or django_value:
-                field.initial = django_value
+                field.initial = to_form_value(to_model_value(django_value))
 
     def save(self, category="default"):
         if not self.is_bound:

apps/common/templates/common/_add_terminal_command_storage_modal.html

@@ -1,21 +0,0 @@
-{% extends '_modal.html' %}
-{% load i18n %}
-{% block modal_id %}add_command_storage_model{% endblock %}
-{% block modal_title%}{% trans "Add command storage" %}{% endblock %}
-{% block modal_body %}
-<form method="post" action="" id="add_command_storage_form">
-    {% csrf_token %}
-    <div class="form-group">
-        <label class="control-label" for="id_assets">{% trans "Template" %}</label>
-        <a href="{% url 'assets:asset-export' %}" style="display: block">{% trans 'Download' %}</a>
-    </div>
-    <div class="form-group">
-        <label class="control-label" for="id_users">{% trans "Asset csv file" %}</label>
-        <input id="id_assets" type="file" name="file" />
-        <span class="help-block red-fonts">
-            {% trans 'If set id, will use this id update asset existed' %}
-        </span>
-    </div>
-</form>
-{% endblock %}
-{% block modal_confirm_id %}btn_asset_import{% endblock %}

apps/common/templates/common/terminal_setting.html

@@ -73,8 +73,8 @@
                                         </tbody>
                                     </table>
 {#                                    <button class="btn btn-default btn-circle btn-add-command-storage" data-toggle="modal" data-target="#add_command_storage_model" tabindex="0" type="button"><i class="fa fa-plus"></i></button>#}
-                                    <div class="hr-line-dashed"></div>
+{#                                    <div class="hr-line-dashed"></div>#}
-                                    <h3>{% trans "Replay storage" %}</h3>
+{#                                    <h3>{% trans "Replay storage" %}</h3>#}
 
                                     <div class="hr-line-dashed"></div>
                                     <div class="form-group">
@@ -92,7 +92,6 @@
             </div>
         </div>
     </div>
-    {% include 'common/_add_terminal_command_storage_modal.html' %}
 {% endblock %}
 {% block custom_foot_js %}
 <script>

apps/jumpserver/settings.py

@@ -378,8 +378,8 @@ COMMAND_STORAGE = {
 }
 
 TERMINAL_COMMAND_STORAGE = {
-    'default': {
+    "default": {
-        'TYPE': 'server',
+        "TYPE": "server",
     },
     # 'ali-es': {
     #     'TYPE': 'elasticsearch',