From b85d89642dfadbf453bd2a8ae451272db59b6362 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Sun, 21 Oct 2018 16:46:38 +0800
Subject: [PATCH] structure update & delete

---
 .idea/workspace.xml                           | 217 ++++++++----------
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 584 -> 602 bytes
 .../views_structure.cpython-36.pyc            | Bin 1835 -> 2019 bytes
 apps/system/tests.py                          |   1 +
 apps/system/urls.py                           |   3 +-
 apps/system/views_structure.py                |  20 +-
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/system/structure/structure.html     |  99 +++++++-
 .../system/structure/structure_create.html    |   5 +-
 9 files changed, 220 insertions(+), 125 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9202b2a..a814f3c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/apps/system/tests.py" afterPath="$PROJECT_DIR$/apps/system/tests.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/views_structure.py" afterPath="$PROJECT_DIR$/apps/system/views_structure.py" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
       <change beforePath="$PROJECT_DIR$/templates/system/structure/structure.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/structure/structure_create.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -23,8 +24,8 @@
       <file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+            <state relative-caret-position="272">
+              <caret line="16" column="43" lean-forward="false" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
               <folding>
                 <element signature="e#73#97#0" expanded="true" />
               </folding>
@@ -35,8 +36,8 @@
       <file leaf-file-name="views_structure.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
-              <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="42" selection-end-column="77" />
+            <state relative-caret-position="592">
+              <caret line="60" column="77" lean-forward="true" selection-start-line="60" selection-start-column="77" selection-end-line="60" selection-end-column="77" />
               <folding>
                 <element signature="e#83#94#0" expanded="true" />
               </folding>
@@ -44,23 +45,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="533">
-              <caret line="35" column="88" lean-forward="true" selection-start-line="35" selection-start-column="88" selection-end-line="35" selection-end-column="88" />
-              <folding>
-                <element signature="e#633#665#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="structure.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2091">
-              <caret line="123" column="39" lean-forward="true" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
+            <state relative-caret-position="1833">
+              <caret line="217" column="15" lean-forward="true" selection-start-line="217" selection-start-column="15" selection-end-line="217" selection-end-column="15" />
               <folding />
             </state>
           </provider>
@@ -69,10 +58,10 @@
       <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+            <state relative-caret-position="255">
+              <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
               <folding>
-                <element signature="e#0#28#0" expanded="true" />
+                <element signature="e#0#37#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -99,13 +88,13 @@
         <option value="$PROJECT_DIR$/apps/system/models.py" />
         <option value="$PROJECT_DIR$/apps/system/mixin.py" />
         <option value="$PROJECT_DIR$/apps/system/views_user.py" />
-        <option value="$PROJECT_DIR$/apps/system/tests.py" />
         <option value="$PROJECT_DIR$/templates/system/system.html" />
         <option value="$PROJECT_DIR$/sandboxMP/urls.py" />
         <option value="$PROJECT_DIR$/templates/system/system_index.html" />
         <option value="$PROJECT_DIR$/apps/system/views.py" />
         <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
         <option value="$PROJECT_DIR$/apps/system/forms.py" />
+        <option value="$PROJECT_DIR$/apps/system/tests.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
         <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
@@ -169,17 +158,6 @@
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
               <item name="apps" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="apps" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
@@ -202,8 +180,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -299,10 +277,10 @@
     <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21762785" sideWeight="0.5021322" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.270636" sideWeight="0.4978678" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21762785" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Mongo Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17590618" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -310,8 +288,8 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18656716" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19042437" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2687704" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -344,39 +322,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="2" />
+      <option name="time" value="7" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/conf.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="11" column="15" lean-forward="true" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-          <folding>
-            <element signature="e#78#113#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="55" lean-forward="true" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
-          <folding>
-            <element signature="e#633#665#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -392,7 +342,7 @@
         <state relative-caret-position="374">
           <caret line="29" column="63" lean-forward="false" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
           <folding>
-            <element signature="e#633#665#0" expanded="true" />
+            <element signature="e#633#665#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -492,9 +442,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="143" column="6" lean-forward="false" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#14#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -539,7 +487,7 @@
         <state relative-caret-position="357">
           <caret line="21" column="55" lean-forward="true" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="55" />
           <folding>
-            <element signature="e#633#665#0" expanded="true" />
+            <element signature="e#633#665#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -577,7 +525,7 @@
         <state relative-caret-position="204">
           <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#0#37#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -587,7 +535,7 @@
         <state relative-caret-position="374">
           <caret line="29" column="63" lean-forward="false" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
           <folding>
-            <element signature="e#633#665#0" expanded="true" />
+            <element signature="e#633#665#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -683,16 +631,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/base.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="143" column="6" lean-forward="false" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#14#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/views.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -729,32 +667,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding>
-            <element signature="e#73#97#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="76" column="27" lean-forward="true" selection-start-line="76" selection-start-column="27" selection-end-line="76" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="652">
@@ -765,40 +677,103 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/tests.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/base.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="459">
+          <caret line="126" column="39" lean-forward="true" selection-start-line="126" selection-start-column="39" selection-end-line="126" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="37" column="5" lean-forward="true" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
+          <folding>
+            <element signature="e#633#665#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/detail.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1156">
+          <caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#55#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/braces/views/_ajax.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="10" column="6" lean-forward="false" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_create.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="524">
+          <caret line="89" column="11" lean-forward="true" selection-start-line="89" selection-start-column="11" selection-end-line="89" selection-end-column="11" />
+          <folding>
+            <element signature="e#577#1428#0#HTML" expanded="false" />
+            <element signature="e#1450#2156#0#HTML" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="42" selection-end-column="77" />
+        <state relative-caret-position="592">
+          <caret line="60" column="77" lean-forward="true" selection-start-line="60" selection-start-column="77" selection-end-line="60" selection-end-column="77" />
           <folding>
             <element signature="e#83#94#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
+    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="533">
-          <caret line="35" column="88" lean-forward="true" selection-start-line="35" selection-start-column="88" selection-end-line="35" selection-end-column="88" />
+        <state relative-caret-position="272">
+          <caret line="16" column="43" lean-forward="false" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
           <folding>
-            <element signature="e#633#665#0" expanded="true" />
+            <element signature="e#73#97#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+        <state relative-caret-position="255">
+          <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#0#37#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2091">
-          <caret line="123" column="39" lean-forward="true" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
+        <state relative-caret-position="1833">
+          <caret line="217" column="15" lean-forward="true" selection-start-line="217" selection-start-column="15" selection-end-line="217" selection-end-column="15" />
           <folding />
         </state>
       </provider>
diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 458f6f4cc0bb7b25eb7b83c46cce45f5b8e478e2..c07abe2598c7d4de36a1655bdd0f3b8ace50112d 100644
GIT binary patch
delta 263
zcmX@Xa*L(jn3tC;R`N_VHxmQHV+JI^0c1M>ad8!pNMT4}%wfo7jAG1Xieh49NMTB0
z&SB1FiDCh>S#nr&*`nBhY}P3DRK^sxRF*7`W`-2@6pmhIAfGdpEsGN@!UYxK28wV2
zMNAn|c%VYOKp}3hB0i8vI!hE!3V$$zroc;}0~j=!Zm|?3mSo&wFG`J{xcrzl?=9|>
zti-(Ze7(}5oZ=#&^BIbmfy6D=vdq--;v!a%0LT+XY?CK5#<B^3m;#f(F}m;xF!3<*
MFtIQTFbV-70O*W1$p8QV

delta 245
zcmYk0Jqp5541kmO)7JLYiiZ$gT)cpTH*kC6AfyyatI(p34$cnZ8N7ju7ZC9XU7fsz
zX>~9m;mb!LsnkR5M`7s0?Ku+y;01r-F^{>*EjI$f405!HK!Ri@a%pA5DpR?(nps;X
zMsi}Ax(6Vayrbl~73<V%jQ=wMn^t2C^}kCYE5A|gdMQyhplAw%&YO?J04sI6-g~AB
uC|#_Q^>9;UWx*dqrMJs?R~Cx7aO<Ye7o0m$jnUZ?leQ5CjZm_KUCs~iF);f8

diff --git a/apps/system/__pycache__/views_structure.cpython-36.pyc b/apps/system/__pycache__/views_structure.cpython-36.pyc
index 7a9c6fb6543dc5161bcdecdd4d60066d3bcf7ffc..a79945adcca5a923162b476e39b4732700fb43be 100644
GIT binary patch
literal 2019
zcmZ`)OK%%D5aw%FD_L@6$8qYul0#oQ)Gks31&Y8h(9|i4#0_Gjhpo}YTBMy-_7#$H
zV?jPS=*|5Rz4gEJ7qG{k@)vsQ3?<8MqpYyQ;gCC=`Mw$I%TA~D>zzM;`YR;lZ*uJk
zK;MSf{0>4ANplk8$Z}e+m{HU@=sf0L7r7{cIPiJ^dKiaZ4?%Cl4bU4h%A=wgH@)7>
zTg5`W;PqDCE;@0Cl7~bt$o4BD+p4M9xri6R(vgc`Sp*9Q%MGyHkX^8Jr<Sgyd!)DY
z8sa3oJ?h%~s;KkSsvk4;3(UoI47Dny(zxS0YwM@V)KzH|%$JUpO{&9z>cgOu%`Y}z
zQ*Z_=%a5w#tbD3o3^T3d<LqTtg0;D4^{{V;8b9vLCOefb`WVIKgHE>LHC+&j#8i@)
zNg8v>AYy*)Qw(u*$DA6giVbt={YqPZW{Z5cCtQ>yWm>2tajhgNDmlziZzsu%VVX}@
zI^e_u;J5xkG#>B8KVLog`rwJKFw>nZR|h67<ze;m@soqJuFb(DfP)i=#w4>a*6UNf
z04|m>6$T<=e*T|a(Y}ov-Uo4&t7NYT<jbXiQOE%D4&BWeWDk^0vmCSUqXT@z^!)}#
z^F0VlEFG``KZhc`pl3|7F&&8Kq29t#vNfW&Y+&i-O!5nM#>afjq_|IPIHocfvvZC|
zLw&@ZSz<|==Z<9(SY-8c*PJbkK6yJ8Nna}{F3(7>;e^ckRyQF|*O-)$aUA{fhu`jN
z=qjQyBcM(gl^?l=hGJ62I<A$~w{U$%k6uDI9I9~*6w?AhXqT?gWg5}Z?K!Be!`>Nk
z*s^$*N3I6N0%DSR%s8M!0keBJN)DLav&?!c&ZI!h%FqJJXWR<hHRdt^s~C$xa8C5k
zFox#@8a4!E8-Q%XMuR3GOJyXR7g*A*-5tOZ8qExIt8YRGJ*rpy;G(QFHZA*VUw;Ue
zQ5PyM&-$s&s&ZpsDr~HFzbdUNZDLPr)obZh*yzNQANHn5BFq|L0dFQbN%Kqstm%o;
zn7b3`#szX%)TS5ccX9W7xByrik9E8_<2X5jcKtv0qOOd+3!fM)c0yYK{t64}A`pPT
z(L3`<z>jv}z&3oMJ17=We1PIp6juy;4QbYRz-@R9QWmkO;Vtuf3L$*6rvPx_mSzDx
z%8Y$`CvAcYtOjhwV{yi?t1NWYK#bXM1UL+!PB`>YIB1MH%tP7moJPBzNGI@iaRQl%
z+jR<;sh!+Kz?+b%P3JMH@4~UYXi8)b5&Blqn79jpKxhTeo&E?c`eWQJt`Qd=Wh$3O
z<E3&9MGqjty8*AkCL^>>SLx{18)#sMz{NS2n|ZW+2EIN=uhWYT=e;E#o?DZHv^=iX
z{rw1zOQo~^`eAC6#@(8OaNX%9^Q_XgKeWd8|0GF_)CC3pjpzvV5Uy~Qo5}qVU_}~V
o-~N8}1)(v3YpKr)$VK-j_x~2wzQI<BSQ}vQzlp||gXPtK0a5ne7ytkO

literal 1835
zcmZ`(&2HQ_5GEx`t6lHf8>jh03#4d)pnKUIS|mUb6b4ebIV7$T8$GB71X-jVE%dV?
zxo*5zpEg(b*mvj~^cngHy7rV;=%xLJ>&Q;yO5kWX8V+aX`^c{cgWf-X{P}YdF!mR_
z@?g%kFwAcdl1W~$n7&@YOE2~~={|Hn_MI*YQ3i3~^Z<GohtNaWDLQ2oM^2B5ZrO`_
zPVW|LWk2q7_5+hWx%QUHH5DmuDdGVveK~+-0E-XHIxOpQ1D1^o%ZB88Y&3j_+}O^D
zH~oE8PK(s4pK|pJ=HlWTYE?<4$>W)|)0fIj>&mEi9P41*d|n^t)l2nymTM(n<Zto{
z*6yCwv&_!4!er1+wrgExwBh@Qf^1=!A%tQvmn`-qkA3MOIseL1%4UAwoEodjhvt3s
zOKtqhmc`CUG*OaNX{nN==_N^7%UMBsKS^HC(&FOJ06|=>&h>YuH?X}Ee?R{I+k;(Q
zPgG{N^Fke%w33JQn-{wW>2zuiRtX%OARCjkX^f|*x`z-qs1y$(^4$D`TFJge4xd3>
z)+)WX4E6d_;45T+y2IvX+p?!xU0{+?0D623f$<c>1+&cZi8t|=;Mh4o^Q>5K=`Fma
zPfY~4@t{pLNsD6s;Q#xWWNt&(&QZ_^nP*l<*s1B%htw6*_z0mX0RSY7Dvp|t2L8&}
z#@EVTHd7O-jeo4{T}qXfFh1n-JJ(b<hF4o5ot(D9XP8)2COuahU$QgbdJ8`B7iinL
zcP18MB9=@)!Z%nloDH$?WblO9&~_#f`oQTFofD;^ooz4@oHnz<LW}as*tE*jzP^Wj
z=0l)d<XLL-x_US<HIccW)s<D1P3-AZjk<ahj;<xT3#}2mKkn@#kV#I`B9~}MdZILy
z&<Kjq1aekR%_z{fXyI-8fj*hI+kz6Ww`y{PGxFaSifL^u(Z;MpFy7-KU+0l~=XbB`
zCN0>(mTPd=eG&r_goFNqM9cV<Mo4L*FQw;@io8fT%k?Dw1b!cr7#$YPjW(g@xv_L`
zTVM&)7T9kvAy|p~#{#qkjV)+A0ertQfEEC7-v&0EbQb;xAT}N~noe^g2$i@$O>s}z
z)!7GTLZ&vo4o&?jb{$0y#6}cIa0TT}n41s?g2xU#eIFM6IeCjK$c0C_Dx}eO=<j6{
zUH_=NUtyRKg7H4T&F8m1Y6dYK7uB`UTn2QSi~1#EJ)o#`{&BI;d^B|FHTUEst&Z!l
zyN?jKQaaDZhpADTytNO}3@@C_t6JM^W{o?%D~1Lo-PpQAej#p4RhZRj4~U1xG2C5c
jjtXw?D^<5iHqn#SRr?+B-Viw=ua6GkU48w{U~~8{pA5KH

diff --git a/apps/system/tests.py b/apps/system/tests.py
index 7ce503c..0b4501e 100644
--- a/apps/system/tests.py
+++ b/apps/system/tests.py
@@ -1,3 +1,4 @@
 from django.test import TestCase
 
 # Create your tests here.
+
diff --git a/apps/system/urls.py b/apps/system/urls.py
index 3f8687c..0b99caa 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path
+from django.urls import path, re_path
 
 from .views import SystemView
 from . import views_structure
@@ -10,5 +10,6 @@ urlpatterns = [
     path('basic/structure/', views_structure.StructureView.as_view(), name='basic-structure'),
     path('basic/structure/create/', views_structure.StructureCreateView.as_view(), name='basic-structure-create'),
     path('basic/structure/list/', views_structure.StructureListView.as_view(), name='basic-structure-list'),
+    path('basic/structure/delete/', views_structure.StructureDeleteView.as_view(), name='basic-structure-delete'),
 ]
 
diff --git a/apps/system/views_structure.py b/apps/system/views_structure.py
index c59c45a..bad7f8d 100644
--- a/apps/system/views_structure.py
+++ b/apps/system/views_structure.py
@@ -8,6 +8,7 @@ from django.views.generic.base import TemplateView
 from django.views.generic.base import View
 from django.shortcuts import render
 from django.shortcuts import HttpResponse
+from django.shortcuts import get_object_or_404
 
 from .mixin import LoginRequiredMixin
 from .models import Structure
@@ -23,11 +24,17 @@ class StructureCreateView(LoginRequiredMixin, View):
 
     def get(self, request):
         ret = dict(structure_all=Structure.objects.all())
+        if 'id' in request.GET and request.GET['id']:
+            structure = get_object_or_404(Structure, pk=request.GET['id'])
+            ret['structure'] = structure
         return render(request, 'system/structure/structure_create.html', ret)
 
     def post(self, request):
         res = dict(result=False)
-        structure = Structure()
+        if 'id' in request.POST and request.POST['id']:
+            structure = get_object_or_404(Structure, pk=request.POST['id'])
+        else:
+            structure = Structure()
         structure_form = StructureForm(request.POST, instance=structure)
         if structure_form.is_valid():
             structure_form.save()
@@ -40,4 +47,15 @@ class StructureListView(LoginRequiredMixin, View):
     def get(self, request):
         fields = ['id', 'name', 'type', 'parent__name']
         ret = dict(data=list(Structure.objects.values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class StructureDeleteView(LoginRequiredMixin, View):
+
+    def post(self, request):
+        ret = dict(result=False)
+        if 'id' in request.POST and request.POST['id']:
+            id_list = map(int, request.POST['id'].split(','))
+            Structure.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
         return HttpResponse(json.dumps(ret), content_type='application/json')
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index 6162f26e79fa53bf2c09d8d5db21a2f2e842e475..c4626046609d44b6b3dacc7131289506a756dcc1 100644
GIT binary patch
delta 126
zcmV-^0D=F2;0%D^43HZEa*-TE0dlcmCNBX5gNHA-hc5wtPzJ>S591HTvk_pq4<H-_
z1pp->0p!1-=7F!|xUJ>CgJflJVRCeBWo~o>8w0oHj{zY-2K4|B`w#WA5n$;L3k3rK
g0RsdC0{{U7w%`FZKLLTaHXj1TPyqzD{BHsTz)ylJ*#H0l

delta 123
zcmZp8z|-)6XM!|i_Cy(H#_Wv=YWj>!&F%Wz+w~di1K5r+@IU51wplP?7r(qT6DxzN
zBIlF+3!gQvf3jok)BVjUsRfBeCAq12CDM%BpY}5<I<S3b;Qzz_9jN0qKPL+_CnFOx
bGXv+g2aKlnj11e&<e82J0O>#ZOe_Zg-mWWA

diff --git a/templates/system/structure/structure.html b/templates/system/structure/structure.html
index 7535829..68ea042 100644
--- a/templates/system/structure/structure.html
+++ b/templates/system/structure/structure.html
@@ -135,6 +135,103 @@
             }
         });
     });
-    </script>
+
+    //checkbox全选
+    $("#checkAll").on("click", function () {
+        if ($(this).prop("checked") === true) {
+            $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+            $('#example tbody tr').addClass('selected');
+        } else {
+            $("input[name='checkList']").prop("checked", false);
+            $('#example tbody tr').removeClass('selected');
+        }
+    });
+
+        //批量删除
+        $("#btnDelete").click(function () {
+            if ($("input[name='checkList']:checked").length == 0) {
+                layer.msg("请选择要删除的记录");
+                return;
+            }
+
+            var arrId = new Array();
+            $("input[name='checkList']:checked").each(function () {
+                //alert($(this).val());
+                arrId.push($(this).val());
+            });
+
+            sId = arrId.join(',');
+
+            layer.alert('确定删除吗？', {
+                title: '提示'
+                , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+                , time: 0 //不自动关闭
+                , btn: ['YES', 'NO']
+                , yes: function (index) {
+                    layer.close(index);
+                    $.ajax({
+                        type: "POST",
+                        url: "{% url 'system:basic-structure-delete' %}",
+                        data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                        cache: false,
+                        success: function (msg) {
+                            if (msg.result) {
+                                layer.alert("操作成功", {icon: 1});
+                                oDataTable.ajax.reload();
+                            } else {
+                                //alert(msg.message);
+                                layer.alert("操作失败", {icon: 2});
+                            }
+                            return;
+                        }
+                    });
+                }
+            });
+        });
+
+        //删除单个数据
+        function doDelete(id) {
+            layer.alert('确定删除吗？', {
+                title: '提示'
+                , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+                , time: 0 //不自动关闭
+                , btn: ['YES', 'NO']
+                , yes: function (index) {
+                    layer.close(index);
+                    $.ajax({
+                        type: "POST",
+                        url: "{% url 'system:basic-structure-delete' %}",
+                        data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},  //防止post数据时报 csrf_token 403
+                        cache: false,
+                        success: function (msg) {
+                            if (msg.result) {
+                                layer.alert('删除成功', {icon: 1});
+                                oDataTable.ajax.reload();
+                            } else {
+                                //alert(msg.message);
+                                layer.alert('删除失败', {icon: 2});
+                            }
+                            return;
+                        }
+                    });
+                }
+            });
+
+        }
+
+    function doUpdate(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'system:basic-structure-create' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+    }
+</script>
 
 {% endblock %}
diff --git a/templates/system/structure/structure_create.html b/templates/system/structure/structure_create.html
index 5a47662..eced8c6 100644
--- a/templates/system/structure/structure_create.html
+++ b/templates/system/structure/structure_create.html
@@ -14,14 +14,16 @@
                     <legend>
                         <h4>组织架构信息</h4>
                     </legend>
+                    <input type="hidden" name="id" value="{{ structure.id }}" />
                     <div class="form-group has-feedback">
                         <label class="col-sm-2 control-label">名称</label>
                         <div class="col-sm-3">
-                            <input class="form-control" name="name" type="text" />
+                            <input class="form-control" name="name" type="text" value="{{ structure.name }}" />
                         </div>
                         <label class="col-sm-2 control-label">类别</label>
                         <div class="col-sm-3">
                             <select class="form-control" name="type">
+                                <option value={{ structure.type }}> {{ structure.get_type_display|default:"--类别--" }} </option>
                                 <option value="unit">单位</option>
                                 <option value="department">部门</option>
                             </select>
@@ -33,6 +35,7 @@
                         <label class="col-sm-2 control-label">所属</label>
                         <div class="col-sm-3">
                             <select class="form-control" name="parent">
+                                <option value={{ structure.parent_id|default_if_none:"" }}> {{ structure.parent.name|default:"" }}
                                 <option></option>
                                 {% for stru in structure_all %}
                                     <option value={{ stru.id }}> {{ stru.name }} </option>