From 1601be1aa1d0af9e379c31359f4475bb98a48d07 Mon Sep 17 00:00:00 2001
From: long2ice <long2ice@gmail.com>
Date: Fri, 14 Jan 2022 21:28:00 +0800
Subject: [PATCH] Fix multiple json field input. (#98)

---
 .github/workflows/pypi.yml                       |  8 ++++----
 CHANGELOG.md                                     |  1 +
 fastapi_admin/templates/widgets/inputs/json.html | 16 ++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 55ae4ac..fec0634 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
           python-version: "3.x"
       - name: Install and configure Poetry
-        uses: snok/install-poetry@v1.1.1
-        with:
-          virtualenvs-create: false
+        run: |
+          pip install -U pip poetry
+          poetry config virtualenvs.create false
       - name: Build dists
         run: make build
       - name: Pypi Publish
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d79e6b9..47d8090 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### 1.0.4
 
 - Add `widgets.filters.Boolean` class
+- Fix multiple json field input. (#98)
 
 ### 1.0.3
 
diff --git a/fastapi_admin/templates/widgets/inputs/json.html b/fastapi_admin/templates/widgets/inputs/json.html
index 6d0fa9d..f705abf 100644
--- a/fastapi_admin/templates/widgets/inputs/json.html
+++ b/fastapi_admin/templates/widgets/inputs/json.html
@@ -22,19 +22,19 @@
 
 </style>
 <script>
-    const container = document.getElementById("{{name}}")
-    let options = {{options|safe}};
-    if (Object.keys(options).length === 0) {
-        options = {
+    const container_{{ name }} = document.getElementById("{{name}}")
+    let options_{{ name }} = {{options|safe}};
+    if (Object.keys(options_{{ name }}).length === 0) {
+        options_{{ name }} = {
             modes: ['tree', 'view', 'form', 'code', 'text', 'preview'],
         }
     }
-    options.onChangeText = function (json) {
+    options_{{ name }}.onChangeText = function (json) {
         $('input[name={{ name }}]').val(json);
     }
-    const editor = new JSONEditor(container, options)
+    const editor_{{ name }} = new JSONEditor(container_{{ name }}, options_{{ name }})
     {% if value %}
-        editor.set({{ value|safe }})
+        editor_{{ name }}.set({{ value|safe }})
     {% endif %}
-    editor.expandAll();
+    editor_{{ name }}.expandAll();
 </script>