From 0f6bd53883a66446ccef7d7b9d5ff982c039f1b4 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Mon, 12 Nov 2018 22:05:32 +0800
Subject: [PATCH] menu update

---
 .idea/workspace.xml                           | 165 ++++++++++--------
 apps/__pycache__/custom.cpython-36.pyc        | Bin 783 -> 2259 bytes
 apps/custom.py                                |  39 ++++-
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 1613 -> 1686 bytes
 .../__pycache__/views_menu.cpython-36.pyc     | Bin 798 -> 1052 bytes
 apps/system/urls.py                           |   2 +-
 apps/system/views_menu.py                     |  17 +-
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/system/menu_list.html               |  16 +-
 templates/system/menu_update.html             | 100 +++++++++++
 10 files changed, 257 insertions(+), 82 deletions(-)
 create mode 100644 templates/system/menu_update.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 42b89eb..d501fd9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/templates/system/menu_list.html" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/apps/custom.py" afterPath="$PROJECT_DIR$/apps/custom.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/views_menu.py" afterPath="$PROJECT_DIR$/apps/system/views_menu.py" />
+      <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
+      <change beforePath="$PROJECT_DIR$/templates/system/menu_list.html" afterPath="$PROJECT_DIR$/templates/system/menu_list.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -19,43 +20,55 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="true">
+      <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="0">
-              <caret line="0" column="28" lean-forward="false" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="views_menu.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_menu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="323">
-              <caret line="19" column="36" lean-forward="false" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
+            <state relative-caret-position="510">
+              <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
               <folding>
-                <element signature="e#77#130#0" expanded="true" />
+                <element signature="e#0#28#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="views_structure.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
+      <file leaf-file-name="menu_update.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/menu_update.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+            <state relative-caret-position="623">
+              <caret line="100" column="0" lean-forward="true" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="menu_list.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/menu_list.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="606">
+              <caret line="160" column="11" lean-forward="true" selection-start-line="160" selection-start-column="11" selection-end-line="160" selection-end-column="11" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="views_menu.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/apps/system/views_menu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="391">
+              <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#41#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="custom.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/custom.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+            <state relative-caret-position="555">
+              <caret line="55" column="53" lean-forward="true" selection-start-line="55" selection-start-column="53" selection-end-line="55" selection-end-column="53" />
               <folding>
                 <element signature="e#73#84#0" expanded="true" />
               </folding>
@@ -68,8 +81,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="HTML File" />
         <option value="Python Script" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -107,14 +120,15 @@
         <option value="$PROJECT_DIR$/apps/system/views_user.py" />
         <option value="$PROJECT_DIR$/apps/system/forms.py" />
         <option value="$PROJECT_DIR$/apps/system/views.menu.py" />
-        <option value="$PROJECT_DIR$/apps/custom.py" />
         <option value="$PROJECT_DIR$/templates/system/menu_form.html" />
-        <option value="$PROJECT_DIR$/templates/system/menu_list.html" />
         <option value="$PROJECT_DIR$/apps/system/apps.py" />
         <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
         <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
+        <option value="$PROJECT_DIR$/templates/system/menu_update.html" />
+        <option value="$PROJECT_DIR$/templates/system/menu_list.html" />
+        <option value="$PROJECT_DIR$/apps/custom.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
       </list>
     </option>
   </component>
@@ -162,6 +176,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -180,16 +195,10 @@
               <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>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -283,30 +292,45 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1448" y="-8" width="1456" height="876" extended-state="7" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <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.24156693" sideWeight="0.5042644" order="7" side_tool="true" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23274696" sideWeight="0.49573562" order="2" 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.23068553" sideWeight="0.49573562" 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.2012894" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1609808" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <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="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.21650879" sideWeight="0.5" order="3" side_tool="false" 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.26792964" 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" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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.24156693" sideWeight="0.5042644" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23274696" sideWeight="0.49573562" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="manage.py@sandboxMP" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28073993" sideWeight="0.5" order="8" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2012894" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
+      <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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" 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.21650879" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -322,13 +346,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <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" />
-        </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="221">
@@ -545,9 +562,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
           <caret line="472" column="4" lean-forward="false" selection-start-line="472" selection-start-column="4" selection-end-line="472" selection-end-column="4" />
-          <folding>
-            <element signature="e#99#134#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -608,7 +622,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
           <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -638,14 +651,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/menu_list.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2177">
-          <caret line="149" column="14" lean-forward="false" selection-start-line="149" selection-start-column="14" selection-end-line="149" selection-end-column="14" />
-          <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="197">
@@ -699,16 +704,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_menu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" column="36" lean-forward="false" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
-          <folding>
-            <element signature="e#77#130#0" expanded="true" />
-          </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="238">
@@ -717,21 +712,49 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/menu_update.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="623">
+          <caret line="100" column="0" lean-forward="true" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/menu_list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="606">
+          <caret line="160" column="11" lean-forward="true" selection-start-line="160" selection-start-column="11" selection-end-line="160" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/apps/custom.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+        <state relative-caret-position="555">
+          <caret line="55" column="53" lean-forward="true" selection-start-line="55" selection-start-column="53" selection-end-line="55" selection-end-column="53" />
           <folding>
             <element signature="e#73#84#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+    <entry file="file://$PROJECT_DIR$/apps/system/views_menu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="28" lean-forward="false" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-          <folding />
+        <state relative-caret-position="391">
+          <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/apps/__pycache__/custom.cpython-36.pyc b/apps/__pycache__/custom.cpython-36.pyc
index 8f962f781850d2af6ecebee881178abfe4fd4516..1a6857e80e2b4704be9a709e57f768eb5c61b8a2 100644
GIT binary patch
literal 2259
zcmZuyOOG2x5bmCbJ+{Z2O|%3OUag2gjDi=5hy#kyl4P?85hqH*YglPCo^J1scOFi6
zI~!Zh1xJKS_z7^}#Gl~AujnhM`~^-_wY{&fGwPbEny%{Zs;{a)X}6o}zr6hMk2)d$
zkYf+XWCMo!83-qw<|M+elheY9oWhM<in5z~g&+Br_wrg%kLs59^Pp%%4NA5Mukrdb
z!s~M<YJwE-21pH%S|Bxf3#684h?a2XeiVW(<ZaNkt*$BDc`a&l`hav+Ucz2Tuj82J
zO(_yBzRkqGX?`=}OTI%*_@&mP`$CPXQVEdjC|~>d8nEZSu6DBWzIZgwq~Le5Cs~=I
z!-K~KW&?&g4@8iNauPY*;|_P9(a5!1@Xc!vl9KnUCtE__?GHt&t)pJ*fDu0Er3K?A
z4D~mV8Ti=?<m!wJ$(%f;oB~IO&R$L4Sa6(PAi&e1tGy%5oO0&{eM-w4OA8+?wEgc}
z3w_MOY7Q+{b&b0)vpx*YlR5o~PC}U5fYqJvNZIvZPs8T0wbzt?QG%}y;hetJwudVj
zU0D4<O6Pkrb0GA!o^dkXp)!CIP1m<XDP)#1E_9OR>@nnlT~@3ZE6w_XrAeL(&h|6C
z%QD_&)2qFTUB2>I$bO|nTqcF+C^o3ZC1*vV)7`AxVR~1vM`Ix;COk3mj0tyyj_ofc
zw5dzTpitVlTbmC}ZII<!NaJRuHr~Cv4<4G8FSM3ff2_r(l$A7%I8O6KsW>)4Y!?U4
z1)s(*DlT#p-l~M^ReJMDrnL0ogvO5xIGSt#-*JtnL_RRV;TGJgKm3!(i}3f~4{m+7
zeNR@1gxgszw$%b2ckXQ`qmkN9AtY7N9ZgIVPXUH7@eCNMw}22QpaFe@Uc}*eG^7rU
zbJPQQ%1%XE_sC6$_Bx(C2X0I=j^QlhT)@%77=o4L809#YxQyNDG4dwru)<ehC`4{R
zt$d;$P``l_)_@$=1EBI5fogC86`omJ?s1c68mn<pRR^_D149qSUG#Dth=xXDQEhP!
zc=Tuf(3unYA$;9AAQ5ouaql|Op7w{enFpBmdF=&au->~3Ra}!ojdT4_GVnKDg&^ly
zn&_-5*N3Vqu?3`6sYR({JsF8k-FQ4pwFxk8gGv@A$W;6|$ukalO#o`RL*t>b@%gwI
zsZLG44myctY`jG7C{x?pw_g`lHy*lqC7i|^RZ71H7AgcnXcH2<c&8Um3sM*7ALLKI
z4JPs(Bv+9jvW^j(uXjOr3C1E{jzsxHz9=X*aKb8(qkKWGFnX>zyWGZ6@0|XAsmb8M
z%t1LymfE(;l9DZedUa9534>$XjtWf41+-7rpRj~!QH*kEzFq6)zR+V?DwdTPAe)ng
z{Z|lMw!bS%TjbEK6PBsvVw|aQnhK=`<2;`**u(%@iduO5e|$_mj(L>=uuqH8M{sf+
zix_zl`4cg6L4l90zJnM&Cj;opfa@S~p95ec??k+g?w7+RkB~uEwvaJx&}^Z(&qz!)
zz<KD-=zz|g-<+BIE8bkTP_YtCZ4p@GtMN!kn{BA!L%7K+FiCcRK(9TEygjA`03zd4
z7z$TMfKAUYGkUZ`i>i)qo5CxgGVNs_Ohuj_kKe&cc9C^(eGM1E8V($Za%V-p4<EC}
zhe^3pb+O$m=tK4nkT_9dFwE-mzuK*&PRCj;N~^V0@4`)NyK5Axi2~?!3%r9Rb_v^k
lETnDD?6Rk2*aX)XeeQE?(-!H0vkE;kbV7G!ZKbtV{}0czCb9qk

delta 471
zcmZutKT88K98Ge$^e9(au_}U#3c?L`ad43$I#`z?iVi1u6qD+e<nEf}{4;gXUF24G
z@jLh}+_H*8zlFJ0P@#d}%X|5S_mbbo+!GmX)oRt3*RS(70^k$;S+3=~w$z>l3Mk|t
zEO*4AKp}!9ceo>Ph$kF#SCEiEZ~&-F$s?eI5r!UcSfTI)1eLM%0o?$a>b_(>&CX(W
z8`PokJ6dPQOl4`J*z<V3Siu|fvB)?(O#12X-QpDYAt~N*XU(xr1`kx47?<WEQvoqp
zG2S;7$%Z*ox>$9W@f(oMqU~%FoTW<Fiz9bwG{d-6cDn&KUKAxg!J^1iqe!GQ=Oy=}
zXqfl-v?CX7v~2!|g;JLDs@YO@kibI|9eC2W$~5Vqmt3W-o4DBa8W*PVqt$gP^<}P=
oEPoXG>RxFkS|YxS6N&B7#AQ~T@ph&UY?rypv)~~g`p9>_0l@@!UH||9

diff --git a/apps/custom.py b/apps/custom.py
index 67e2975..fc91465 100644
--- a/apps/custom.py
+++ b/apps/custom.py
@@ -4,13 +4,34 @@
 
 import json
 
-from django.views.generic import CreateView
+from django.views.generic import CreateView, UpdateView
 from django.shortcuts import HttpResponse
+from django.http import Http404
 
 from system.mixin import LoginRequiredMixin
 
 
-class SimpleInfoCreateView(LoginRequiredMixin, CreateView):
+class SandboxGetObjectMixin:
+    def get_object(self, queryset=None):
+
+        if queryset is None:
+            queryset = self.get_queryset()
+        if 'id' in self.request.GET and self.request.GET['id']:
+            queryset = queryset.filter(id=int(self.request.GET['id']))
+        elif 'id' in self.request.POST and self.request.POST['id']:
+            queryset = queryset.filter(id=int(self.request.POST['id']))
+        else:
+            raise AttributeError("Generic detail view %s must be called with id. "
+                                 % self.__class__.__name__)
+        try:
+            obj = queryset.get()
+        except queryset.model.DoesNotExist:
+            raise Http404("No %(verbose_name)s found matching the query" %
+                          {'verbose_name': queryset.model._meta.verbose_name})
+        return obj
+
+
+class SandboxEditViewMixin:
 
     def post(self, request, *args, **kwargs):
         res = dict(result=False)
@@ -19,3 +40,17 @@ class SimpleInfoCreateView(LoginRequiredMixin, CreateView):
             form.save()
             res['result'] = True
         return HttpResponse(json.dumps(res), content_type='application/json')
+
+
+class SandboxCreateView(LoginRequiredMixin, SandboxEditViewMixin, CreateView):
+    """"
+    View for create an object, with a response rendered by a template.
+    Returns information with Json when the data is created successfully or fails.
+    """
+
+
+class SandboxUpdateView(LoginRequiredMixin, SandboxEditViewMixin, SandboxGetObjectMixin, UpdateView):
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        return super().post(request, *args, **kwargs)
\ No newline at end of file
diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 72896b5636334864f8822a7735a9e15703479f80..1376f9423b5d767a40ab3bf75f9784bab8d42f4e 100644
GIT binary patch
delta 147
zcmX@hGmTf-n3tC;v-xFo5jz9JV+JH324p(`adFi~<zz;gRK^s|RQ4>XEY4<z6s;7F
zUgmV6DCrdKU<OT{%@Y`3Flkf?79}Mn>*uECmFkxkq$HN4>Q@PXgmghdx)32hO_|Nr
eECGz1QGC8Y(a?gF$wydY8MP)Wv1v02F#-THMJBia

delta 79
zcmbQndzMGpn3tDJ`{1)^F?I%q#|%h76v%b};^K^r%E^pe>4H&GDVo6ynp&F|F}`48
X_S2N!yon`%ak3Cw7^BAIOg3!*ZgCKs

diff --git a/apps/system/__pycache__/views_menu.cpython-36.pyc b/apps/system/__pycache__/views_menu.cpython-36.pyc
index 144bc46dee427a0e15eef3e5b4d98880cdaa45c6..f497cd3b96f6b1b77eec78da03d61d6236d777cb 100644
GIT binary patch
delta 488
zcmY+BJ5R$f5XXIX(&p7tXn6^N%0`whY={BD(1pi<U@$`!YJ*ZWX=Jz1jiC%I3{^)E
z;w$hum{_xRf{ky$86gB`-A{M_^W&_0Dm*&P%~Hubx_dusQ9`EVkJ%XSpz97o5CL71
z00$s~3f83w;|yaWtge;VeB4~yvPX=&O(GoO-V)(TCShc84;4@NsQ9vgJA4rwld$xT
zw~`QYXFt~c@k6~%^V#Dl73aO-o{~{tp2qU}S31eW%j+V5GnvA3ST=202nQ@s3mCM~
ze~n?ZgRVEmpVeJKc|jH>>o^^EL<GAB?g<N9u=DbPOb2-N&uhxXLwT_^_*Ozt9_ELk
zKiQ_sH)_TdYkiqyUEJSFqeQm!;Nl`4stT6WtihZ?)u8qt^Cn$Fn4)$NrgyWx)x$90
zHPMOE%U<IOKdu{>GL<TBD;x{S?PMh$#;G!Y=6;lAy3ro!elJmGN|QIb3QLm@x;_t>
Q>HrbY04fl$N@33a0<jio^#A|>

delta 249
zcmbQkF^|pNn3tDJ`{1+aUyKY4j~S2vE0FB~#KloSB84G^F^3_SF^VylDT;}aA%!W0
zIfpryC5i>eW=LVlndmNO#@5Un#p%wF!jZz+!jQt5%96_1%o4?w!WGP*$^8;&3WFxo
zEe@Z|;*zk;)bd+gp#>?4C8-nVD+n;&5(&=CEyzjr%uCC6E=t{aU!0MVXYzN(1)@SA
zC$Ins4n`KnA~7JtPm_CcKeM!45i^i;i#0d1A~UZD<k~3i#Daoiz2ws3lKkAsCzxd?
XzhagZ2FVn20SN&n9!4N!7GMJaVktL-

diff --git a/apps/system/urls.py b/apps/system/urls.py
index 74cf530..31d9576 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -25,6 +25,6 @@ urlpatterns = [
 
     path('rbac/menu/', views_menu.MenuListView.as_view(), name='rbac-menu'),
     path('rbac/menu/create/', views_menu.MenuCreateView.as_view(), name='rbac-menu-create'),
-
+    path('rbac/menu/update/', views_menu.MenuUpdateView.as_view(), name='rbac-menu-update'),
 
 ]
diff --git a/apps/system/views_menu.py b/apps/system/views_menu.py
index 9d677a5..bd8b623 100644
--- a/apps/system/views_menu.py
+++ b/apps/system/views_menu.py
@@ -1,15 +1,11 @@
-# @Time   : 2018/11/9 12:24
-# @Author : RobbieHan
-# @File   : views.menu.py
-
-from django.views.generic import ListView, UpdateView
+from django.views.generic import ListView
 
 from .mixin import LoginRequiredMixin
-from apps.custom import SimpleInfoCreateView
+from apps.custom import SandboxCreateView, SandboxUpdateView
 from .models import Menu
 
 
-class MenuCreateView(SimpleInfoCreateView):
+class MenuCreateView(SandboxCreateView):
     model = Menu
     fields = '__all__'
     extra_context = dict(menu_all=Menu.objects.all())
@@ -18,3 +14,10 @@ class MenuCreateView(SimpleInfoCreateView):
 class MenuListView(LoginRequiredMixin, ListView):
     model = Menu
     context_object_name = 'menu_all'
+
+
+class MenuUpdateView(SandboxUpdateView):
+    model = Menu
+    fields = '__all__'
+    template_name_suffix = '_update'
+    extra_context = dict(menu_all=Menu.objects.all())
diff --git a/db.sqlite3 b/db.sqlite3
index 4153a6b317add283eb9ea2118b3bdad8b4ebd9d6..09a81ca1a49707bde7f7236aa74e2f1166470659 100644
GIT binary patch
delta 344
zcmZp8z|-)6XM!~2nu#*bjB7R~*y=NKY@Vl|Rv^N`e}jSl5C13r=lqZO@ABW^|IYtr
zvtYsjei0UC21X7L!44wWKm_aNH|s?M#QFCyaPR@O-Q~N%U&*h;FUrrs_lN)dW<`Yq
zd|paS><p^HstlY@=kI#Hu;InJeb4u<Gc+;|jtmZQ_0@H94EA*9VrOUI=jUf&Fflgf
zW&^YN8H|8{n-$721cK>G{EV{{85kIVrlFX}!vR#qAj-gC>X)CFI{hv`qdL$Za~Sy7
z@vq=t#6O4sKK}>)bNpL?{%GNsU}ffKH01!1ChQ>6hz&#<vQFP3&lmvIH;aM)J^y_E
lS^Qu4FY#~SU&X%!sIQ4%4B>xdUF{q68G)E-`UZXG0002MSK<Hw

delta 164
zcmZp8z|-)6XM!~2!ih4@j0-m=*y=N~Y@Vl|R=~r;|AvA85C13r@BD8z3ntv*-~491
zXaGM00|N`c5(EET{yqGa{7Rb@6@>VwEAcbVQj}+6XHW$~&ZqNtJzv=HV%@&yd)Ea=
z28X!%>N+_Fdpb|Q%g?CJ!ot6WVY`3;V-Nqt4GPn@$TJ22t=hoA|DOK~|0VtnK&uw;
Qw{OsA1Y)M?8}yk20R3k-asU7T

diff --git a/templates/system/menu_list.html b/templates/system/menu_list.html
index 886b73f..c6ec2f7 100644
--- a/templates/system/menu_list.html
+++ b/templates/system/menu_list.html
@@ -141,10 +141,24 @@
             content: "{% url 'system:rbac-menu-create' %}",
             end: function () {
                 //关闭时做的事情
-                oDataTable.data.reload();
+                window.location.reload();
             }
         });
     });
 
+     function doUpdate(id) {
+        layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'system:rbac-menu-update' %}" + '?id=' + id, 'no'],
+            end: function () {
+                //关闭时做的事情
+                window.location.reload();
+            }
+        });
+    }
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/system/menu_update.html b/templates/system/menu_update.html
new file mode 100644
index 0000000..8b8edc6
--- /dev/null
+++ b/templates/system/menu_update.html
@@ -0,0 +1,100 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ menu.id }}"/>
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>修改菜单</h4>
+                    </legend>
+                    <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" value="{{ menu.name }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">代码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="code" type="text" value="{{ menu.code }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">图标</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="icon" type="text" value="{{ menu.icon | default:'' }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">父菜单</label>
+                        <div class="col-sm-3">
+                            <select class="form-control select2" name="parent">
+                                <option value="{{ menu.parent.id }}">{{ menu.parent.name }}</option>
+                                {% for parent_menu in menu_all %}
+                                    <option value={{ parent_menu.id }}> {{ parent_menu.name }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">URL</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="url" type="text" value="{{ menu.url | default:'' }}"/>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-menu-update' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll(); //关闭所有弹窗
+                        });
+                    } else {
+                        layer.alert('数据保存失败', {icon: 5});
+                        //$('errorMessage').html(msg.message)
+                    }
+                    return;
+                }
+            });
+        });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}