From 8c3158b18e771547d434a06b7dbff699ee5d34bb Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Sat, 10 Nov 2018 19:36:12 +0800
Subject: [PATCH] menu list

---
 .idea/workspace.xml                           | 314 +++++++++---------
 apps/__pycache__/custom.cpython-36.pyc        | Bin 783 -> 783 bytes
 apps/system/__pycache__/forms.cpython-36.pyc  | Bin 3909 -> 3909 bytes
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 1574 -> 1613 bytes
 .../__pycache__/views_menu.cpython-36.pyc     | Bin 492 -> 798 bytes
 .../views_structure.cpython-36.pyc            | Bin 3625 -> 3625 bytes
 apps/system/urls.py                           |   5 +-
 apps/system/views_menu.py                     |   9 +-
 sandboxMP/__pycache__/settings.cpython-36.pyc | Bin 2517 -> 2517 bytes
 templates/system/menu_list.html               | 150 +++++++++
 10 files changed, 321 insertions(+), 157 deletions(-)
 create mode 100644 templates/system/menu_list.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6224d59..42b89eb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,10 @@
 <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/system/forms.py" afterPath="$PROJECT_DIR$/apps/system/forms.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views_menu.py" afterPath="$PROJECT_DIR$/apps/system/views_menu.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -19,26 +19,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="urls.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#37#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="views_user.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1054">
-              <caret line="62" column="53" lean-forward="false" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
-              <folding>
-                <element signature="e#78#87#0" expanded="true" />
-              </folding>
+            <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>
@@ -46,20 +32,30 @@
       <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="187">
-              <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="53" />
+            <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#121#0" expanded="true" />
+                <element signature="e#77#130#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">
+          <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" />
+              <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="357">
-              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+            <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" />
               <folding>
                 <element signature="e#73#84#0" expanded="true" />
               </folding>
@@ -67,16 +63,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="menu_form.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/system/menu_form.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="66" column="49" lean-forward="true" selection-start-line="66" selection-start-column="49" selection-end-line="66" selection-end-column="49" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -107,12 +93,10 @@
         <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/tests.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/strueture_users.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/strueture_user.html" />
-        <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_user.html" />
         <option value="$PROJECT_DIR$/templates/system/users/user_create.html" />
@@ -123,10 +107,14 @@
         <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/system/urls.py" />
         <option value="$PROJECT_DIR$/apps/custom.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_menu.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" />
       </list>
     </option>
   </component>
@@ -137,8 +125,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-1448" />
-    <option name="y" value="-8" />
+    <option name="x" value="-1379" />
+    <option name="y" value="113" />
     <option name="width" value="1456" />
     <option name="height" value="876" />
   </component>
@@ -174,7 +162,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -193,11 +180,17 @@
               <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>
   <component name="PropertiesComponent">
@@ -215,16 +208,16 @@
     </option>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
+      <recent name="D:\ProjectFile\sandboxMP\apps" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
       <recent name="D:\ProjectFile\sandboxMP\templates" />
       <recent name="D:\ProjectFile\sandboxMP\templates\system\users" />
       <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
       <recent name="D:\ProjectFile\sandboxMP\apps\system" />
-      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
-      <recent name="D:\ProjectFile\sandboxMP\apps" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -291,13 +284,12 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-1448" y="-8" width="1456" height="876" extended-state="7" />
-    <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.26985854" sideWeight="0.5021322" 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.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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24221921" sideWeight="0.4978678" order="2" 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="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" />
@@ -325,40 +317,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="20" />
+      <option name="time" value="24" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/apps/system/forms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="43" column="0" lean-forward="true" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <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="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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sandboxMP/urls.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
@@ -436,13 +399,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="29" column="18" lean-forward="true" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
-        </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">
@@ -486,13 +442,6 @@
         </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="541">
-          <caret line="88" column="77" lean-forward="true" selection-start-line="88" selection-start-column="77" selection-end-line="88" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/urls/resolvers.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
@@ -559,14 +508,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/mixin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <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 />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/db/models/base.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -587,7 +528,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="595">
           <caret line="39" column="22" lean-forward="false" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -611,32 +551,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#37#0" expanded="true" />
-          </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="178">
-          <caret line="107" column="6" lean-forward="false" selection-start-line="107" selection-start-column="6" selection-end-line="107" selection-end-column="6" />
-          <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="76">
-          <caret line="110" column="52" lean-forward="false" selection-start-line="110" selection-start-column="52" selection-end-line="110" selection-end-column="52" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/users/user.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="500">
@@ -649,15 +563,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
           <caret line="10" column="57" lean-forward="true" selection-start-line="10" selection-start-column="57" selection-end-line="10" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/edit.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="69" column="6" lean-forward="false" selection-start-line="69" selection-start-column="6" selection-end-line="69" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -681,48 +586,151 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
+    <entry file="file://$PROJECT_DIR$/apps/system/mixin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="9" column="4" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="10" />
+        <state relative-caret-position="119">
+          <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 />
         </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="1054">
+        <state relative-caret-position="-815">
           <caret line="62" column="53" lean-forward="false" selection-start-line="62" selection-start-column="53" selection-end-line="62" selection-end-column="53" />
           <folding>
-            <element signature="e#78#87#0" expanded="true" />
+            <element signature="e#78#87#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+    <entry file="file://$PROJECT_DIR$/apps/system/apps.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+        <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>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="56" column="38" lean-forward="true" selection-start-line="56" selection-start-column="38" selection-end-line="56" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/menu_form.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1122">
+          <caret line="66" column="49" lean-forward="false" selection-start-line="66" selection-start-column="49" selection-end-line="66" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="72" column="24" lean-forward="true" selection-start-line="72" selection-start-column="24" selection-end-line="72" selection-end-column="24" />
           <folding>
-            <element signature="e#73#84#0" expanded="true" />
+            <element signature="e#0#28#0" expanded="false" />
+          </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="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">
+          <caret line="130" column="33" lean-forward="true" selection-start-line="130" selection-start-column="4" selection-end-line="130" selection-end-column="33" />
+          <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="78">
+          <caret line="114" column="33" lean-forward="true" selection-start-line="114" selection-start-column="4" selection-end-line="114" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/shortcuts.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="56" column="50" lean-forward="true" selection-start-line="56" selection-start-column="21" selection-end-line="56" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/http/response.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1063">
+          <caret line="475" column="6" lean-forward="false" selection-start-line="475" selection-start-column="6" selection-end-line="475" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/views/generic/edit.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="971">
+          <caret line="181" column="6" lean-forward="false" selection-start-line="181" selection-start-column="6" selection-end-line="181" selection-end-column="6" />
+          <folding>
+            <element signature="e#559#654#0" expanded="false" />
+            <element signature="e#690#758#0" expanded="false" />
+            <element signature="e#798#864#0" expanded="false" />
+            <element signature="e#915#1106#0" expanded="false" />
+            <element signature="e#1147#1527#0" expanded="false" />
+            <element signature="e#1568#1819#0" expanded="false" />
+            <element signature="e#1861#1978#0" expanded="false" />
+            <element signature="e#2022#2149#0" expanded="false" />
+            <element signature="e#2201#2373#0" expanded="false" />
+            <element signature="e#2554#3721#0" expanded="false" />
+            <element signature="e#3762#3978#0" expanded="false" />
+            <element signature="e#4019#4503#0" expanded="false" />
           </folding>
         </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="187">
-          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="53" />
+        <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#121#0" expanded="true" />
+            <element signature="e#77#130#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/menu_form.html">
+    <entry file="file://$PROJECT_DIR$/apps/system/views_structure.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="66" column="49" lean-forward="true" selection-start-line="66" selection-start-column="49" selection-end-line="66" selection-end-column="49" />
+        <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" />
+          <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" />
+          <folding>
+            <element signature="e#73#84#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="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>
diff --git a/apps/__pycache__/custom.cpython-36.pyc b/apps/__pycache__/custom.cpython-36.pyc
index 4c1262fcf6413c02228c5cc38b69687bc6f30d0c..8f962f781850d2af6ecebee881178abfe4fd4516 100644
GIT binary patch
delta 21
dcmeBY>t|y#=H=y@vwS1l1SZB?lczIP002MY29p2)

delta 21
ccmeBY>t|y#=H=xwnYxi}0uy7@<mpTm05`k^nE(I)

diff --git a/apps/system/__pycache__/forms.cpython-36.pyc b/apps/system/__pycache__/forms.cpython-36.pyc
index 56b28e783beec3722acba4b094ec259f13b76840..86c7ea01a28864a10425c35d7b6775b8ab49c5b9 100644
GIT binary patch
delta 15
WcmX>qcT|qen3tDp&hm|H_WS@QSOjbU

delta 15
WcmX>qcT|qen3tF96W2yIdwu{VO9UkV

diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 6bf5a5c5069d250b8ff9935525e2b58b10a34d65..72896b5636334864f8822a7735a9e15703479f80 100644
GIT binary patch
delta 522
zcmYk(yH3L}6b4{BiJc}*dT-i>mTL<w2z6jUV(J6H#1<yN5j1KTS}qbx2WA$+BOqR&
zD+>?63v@+7;w?BnIs=yc>-T4SvERKfZ+_tW?%wCmSzt5v&Hjx#^byS2HD^pQ#V0J~
z5$8-9%A6Rf8JXCviIs{-q%xAJ9ob+a%EesC*i4)!rfijaHev0=B5_e%l03*fkK_^g
zKpskgqzK}plt{`T1(XU&HI_*crAAT*DWL=;4UjTQlcWVwnInZnD?nA0Hc1DhhO$bs
z22w{^C)ofAP&P@nKpH4rl3r{lO_Xht9gtSi)=$*ebXAT*H8^F1-Cz9+1HQBtul&sj
z-08*n<uHwJ?uL(!?)$oDht^SNDelMd!)$87g{h-M=#V<>MP^yt@lN3I@pyKdy@;+1
T^-h?5h>_?+^)fDdMuq<Yi4=73

delta 486
zcmYk(y-ve05C?EOv7Izc+VuMiC=^=g%*57-7l6qO2+0-@H4;h@OsE4hQzmxAz}l5p
z=nHg1h=I4@a=L+&eEQ$-w(~lC50}SL6r4W&T&xvi-|SyCA<y6~G-u2(!{;pJnx~F-
zI5UoM=WZ&rz%1r6Ra&K<_EKN_U{aSXH_D16cxJ{k{)-E9$*QD`5|Av*Kp|2{6oEu2
z6_P4Q1tlh_fmBiIBn|5&F-nu91yVz4lXO7pC|#1?5~zXHCmMh>QMO37L0Tv~Btwuk
z$}Y(sNC#y^vJcWlIUpHZKk1=N3b~GT-*gVo*!1YPxck)Eh`X!%n~j&*%hfA?bMkX>
vGRj=oZREqPeOzP`auyT~zKdmE(frki5Ip~sLp3PoLH;FYasn~VCu;l$Bv@<K

diff --git a/apps/system/__pycache__/views_menu.cpython-36.pyc b/apps/system/__pycache__/views_menu.cpython-36.pyc
index 11b3e318c3e86cc2614ee5fcd19b86f63d03fb19..144bc46dee427a0e15eef3e5b4d98880cdaa45c6 100644
GIT binary patch
literal 798
zcmZuvQE$^Q5VjLHNz-<kM&TFm5+U^g-Vj2SK%0=(YGQ&1Q_0HWTb0U5Iy;5#xxDg2
z_!;~Szak;+FYJlCbkhJ4%U{mtyYqdY{bDpqpZ)mt>6SD0ll}4a(4OLS5<xS~4Xe21
zRUiY-bf7~MRzeE2nHHv3MKbFAJrh@nOgKAXI@0l1relb9q3q*2(S2O^K>*(gnd<bM
zWrG{6&$7TLr=@E@mhi==AJ#f=f$SS>i)Gv&oi@v|eh*ih(t@6q+p<RQ_`Iyv2Hw?|
z%^M4MDd-n7s5b@Gz5hZqra0YG1YnYDCIbki&|LN)f^ZeDk{$B;#${iJ*q87JROO+r
zkCn=eQ3?-8D%_&gJWG9|RGn9#luwna8oe=O50$#w<YvEPV?5UPa1)G=E=w@ld7;aq
z^>K5tf}(Xk#BzQF+t%i)XzCWN@63)dv4h*^Z(lCXY(v4vrGbUZYkkpdXJ?Ciy><(C
z?OLc7pHVcYsJ+Sh+9sGi#OWf0gbN&<?=Njg;wc5uS^sLI1Jok)L(<~@f^3R`^DMFh
z{9CGTM+8LD9w7KfcLda)T&K?imA&<tqMslf;dBCl8tgptY#_&amDkH=(h-_0p$1zP
zHlQTBOcawIfu(0E2c*EH*toW-EK&7QC$-zRL@IQ3|JQ;~UhVJfHI;Hi?JyW}9N}T~
E8!r;Vg#Z8m

delta 265
zcmbQo_J+CMn3tF9(5$D?ri=^>j~S2v3y|#q#Kk&5B84G^F^3_SF^Z9qA%!W0Ifp5i
zIf|K)!JQ$6C55$xA%!)Sv6(rFC50`RL6iL@PzQr1<1LZk%-n*URL{J$eCMLn#FEso
z%+&IiK#M?<EWW9ErO6X-M=?fCHe)noWSN}7Xu&1`lq?dMyo}KzixtS^1ma>gAi=@N
z0)#~%F+WY#DDK39f?~bo(&Cc*+#)8R;4QY?{FKz3;v$f<!ODstMuE6smLNzKhYe6!
RX-=vg$e?17S{_CoW&nfKHI@JX

diff --git a/apps/system/__pycache__/views_structure.cpython-36.pyc b/apps/system/__pycache__/views_structure.cpython-36.pyc
index 2b4d80bf70e2501fe2482b398fed69905035dfde..c8ea9d684805e8b31932848d7b54df7b0bdb3b55 100644
GIT binary patch
delta 16
XcmZ1}vr>lLn3tF9@A79G*_HSJEjR^R

delta 16
XcmZ1}vr>lLn3tF9=jMkS*_HSJElUMn

diff --git a/apps/system/urls.py b/apps/system/urls.py
index 47bfdb2..74cf530 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, re_path
+from django.urls import path
 
 from .views import SystemView
 from . import views_structure, views_user, views_menu
@@ -23,5 +23,8 @@ urlpatterns = [
     path('basic/user/enable/', views_user.UserEnableView.as_view(), name='basic-user-enable'),
     path('basic/user/disable/', views_user.UserDisableView.as_view(), name='basic-user-disable'),
 
+    path('rbac/menu/', views_menu.MenuListView.as_view(), name='rbac-menu'),
     path('rbac/menu/create/', views_menu.MenuCreateView.as_view(), name='rbac-menu-create'),
+
+
 ]
diff --git a/apps/system/views_menu.py b/apps/system/views_menu.py
index f522b10..9d677a5 100644
--- a/apps/system/views_menu.py
+++ b/apps/system/views_menu.py
@@ -2,6 +2,9 @@
 # @Author : RobbieHan
 # @File   : views.menu.py
 
+from django.views.generic import ListView, UpdateView
+
+from .mixin import LoginRequiredMixin
 from apps.custom import SimpleInfoCreateView
 from .models import Menu
 
@@ -12,6 +15,6 @@ class MenuCreateView(SimpleInfoCreateView):
     extra_context = dict(menu_all=Menu.objects.all())
 
 
-
-
-
+class MenuListView(LoginRequiredMixin, ListView):
+    model = Menu
+    context_object_name = 'menu_all'
diff --git a/sandboxMP/__pycache__/settings.cpython-36.pyc b/sandboxMP/__pycache__/settings.cpython-36.pyc
index bee31c19de3add1dbe4c2b48c86e4e77558255b5..294207ea8aaeef6f28c4b65030ad56ba3b5ffed9 100644
GIT binary patch
delta 16
XcmcaAd{vm;n3tEUaoMwt?B_TEFHHr@

delta 16
YcmcaAd{vm;n3tDp@4k~8+0StT05I?d0ssI2

diff --git a/templates/system/menu_list.html b/templates/system/menu_list.html
new file mode 100644
index 0000000..886b73f
--- /dev/null
+++ b/templates/system/menu_list.html
@@ -0,0 +1,150 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+
+{% block content %}
+    <!-- Main content -->
+    <section class="content">
+        <div id="devlist">
+            <div class="box box-primary" id="liebiao">
+                <div class="box-header">
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnRefresh" class="btn btn-default">
+                            <i class="glyphicon glyphicon-repeat"></i>刷新
+                        </button>
+                    </div>
+                    <div class="btn-group pull-left">&nbsp</div>
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnCreate" class="btn btn-default">
+                            <i class="glyphicon glyphicon-plus"></i>新增
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <table id="dtbList" class="display" cellspacing="0" width="100%">
+                        <thead>
+                        <tr valign="middle">
+                            <th><input type="checkbox" id="checkAll"></th>
+                            <th>ID</th>
+                            <th>名称</th>
+                            <th>代码</th>
+                            <th>URL</th>
+                            <th>图标</th>
+                            <th>父菜单</th>
+                            <th>操作</th>
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                    <br> <br>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
+    <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+    <!-- iCheck 1.0.1 -->
+    <script type="text/javascript">
+        $(function () {
+            $('#SYSTEM-RBAC').addClass('active');
+            $('#SYSTEM-RBAC-MENU').addClass('active');
+
+        });
+    </script>
+
+    <script type="text/javascript">
+        var oDataTable = null;
+        var data = [
+            {% for menu in menu_all %}
+            {
+                "id": "{{ menu.id }}",
+                "name": "{{ menu.name }}",
+                "code": "{{ menu.code }}",
+                "url":  "{{ menu.url | default_if_none:'' }}",
+                "icon": "{{ menu.icon | default_if_none:'' }}",
+                "parent": "{{ menu.parent.name }}"
+            },
+            {% endfor %}
+        ];
+
+        $(function () {
+            oDataTable = initTable();
+
+            function initTable() {
+                var oTable = $('#dtbList').DataTable($.extend(true, {},
+                    DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                    {
+                        data: data,
+                        columns: [
+                            DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                            {
+                                data: "id",
+                                width: "5%",
+                            },
+                            {
+                                data: "name",
+                            },
+                            {
+                                data: "code",
+                            },
+                            {
+                                data: "url",
+                            },
+                            {
+                                data: "icon",
+                            },
+                            {
+                                data: "parent",
+                            },
+                            {
+                                data: "id",
+                                bSortable: "false",
+                                render: function (data, type, row, meta) {
+                                    var ret = "";
+                                    var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                        + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                    return ret;
+                                }
+                            }
+                        ],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    $("#btnRefresh").click(function () {
+            window.location.reload();
+        });
+
+    $("#btnCreate").click(function () {
+        layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: "{% url 'system:rbac-menu-create' %}",
+            end: function () {
+                //关闭时做的事情
+                oDataTable.data.reload();
+            }
+        });
+    });
+
+    </script>
+{% endblock %}
\ No newline at end of file