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 1/9] 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

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 2/9] 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 %}

From 4570252f6d2354df23b427bb895dbc683b55628b Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Wed, 14 Nov 2018 13:44:27 +0800
Subject: [PATCH 3/9] role create&update&list

---
 .idea/workspace.xml                           | 189 +++++++-----------
 apps/system/__pycache__/models.cpython-36.pyc | Bin 3643 -> 3643 bytes
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 1686 -> 1973 bytes
 .../__pycache__/views_role.cpython-36.pyc     | Bin 0 -> 1472 bytes
 .../views_structure.cpython-36.pyc            | Bin 3625 -> 3625 bytes
 apps/system/urls.py                           |   6 +-
 apps/system/views_role.py                     |  36 ++++
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/system/role.html                    | 149 ++++++++++++++
 templates/system/role_form.html               |  80 ++++++++
 templates/system/role_update.html             |  81 ++++++++
 11 files changed, 425 insertions(+), 116 deletions(-)
 create mode 100644 apps/system/__pycache__/views_role.cpython-36.pyc
 create mode 100644 apps/system/views_role.py
 create mode 100644 templates/system/role.html
 create mode 100644 templates/system/role_form.html
 create mode 100644 templates/system/role_update.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d501fd9..b374108 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <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,64 +16,7 @@
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="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>
-      </file>
-      <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="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="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>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -124,11 +64,15 @@
         <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/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$/templates/system/role_create.html" />
         <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
+        <option value="$PROJECT_DIR$/templates/system/role_update.html" />
+        <option value="$PROJECT_DIR$/apps/system/urls.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
+        <option value="$PROJECT_DIR$/templates/system/role.html" />
       </list>
     </option>
   </component>
@@ -138,11 +82,11 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="-1379" />
-    <option name="y" value="113" />
-    <option name="width" value="1456" />
-    <option name="height" value="876" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -176,7 +120,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -192,14 +136,24 @@
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="apps" type="462c0819:PsiDirectoryNode" />
+              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
               <item name="system" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -293,22 +247,21 @@
   </component>
   <component name="ToolWindowManager">
     <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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1936888" 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.1609808" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14978679" 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.26792964" 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.21650879" 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" />
@@ -346,34 +299,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/apps/system/views_user.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="20" column="6" lean-forward="false" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" 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="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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/bootstrap/js/npm.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -712,16 +637,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="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">
@@ -740,7 +655,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/apps/custom.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="555">
+        <state relative-caret-position="691">
           <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" />
@@ -748,16 +663,60 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role_update.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="657">
+          <caret line="80" column="14" lean-forward="false" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="595">
+          <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
+          <folding>
+            <element signature="e#78#89#0" expanded="true" />
+          </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="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" />
+        <state relative-caret-position="136">
+          <caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="9" selection-end-column="22" />
           <folding>
             <element signature="e#0#41#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="657">
+          <caret line="145" column="1" lean-forward="true" selection-start-line="145" selection-start-column="1" selection-end-line="145" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role_form.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="70" column="11" lean-forward="true" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
+          <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="578">
+          <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/apps/system/__pycache__/models.cpython-36.pyc b/apps/system/__pycache__/models.cpython-36.pyc
index 5f4dd806484475df51a67a45848d8bfe76e8cc70..efe19f91401479f3171bd4e3a5b68fb3e8e2e702 100644
GIT binary patch
delta 16
Xcmdljvs;GUn3tEUa`x+u>?V8wE3E|v

delta 16
Xcmdljvs;GUn3tDpS=f_}>?V8wD<=f!

diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 1376f9423b5d767a40ab3bf75f9784bab8d42f4e..0eaf445842abf907f5aae890033ad39d5231d087 100644
GIT binary patch
delta 814
zcmZ9}OHbQC5CC9rNF2wHynqlAo=u^cHl#pLoRGLy9E#xJ9;%dGQLOM<n<9M4q30e@
z1pk3E?H{NRKO*X->Iqf-56lds2Gy2FGvAJO$M%)?z0g?oJp1z7pZ7m4!}x7HxoVKF
z!xP<IG@9K5E3kwiGeJ%XX{w>n{$j|iw7w2Ool}|6A+cE;5SPSd@jyJ1JWBy2Pf}zl
zffPu}EW^qSiy&P?jxdb^m8hx0G6qs6sj`fN43pGY>L4Q|6D*S;qa;%-(;yX+8J1a)
zF_f-+#?%0+QqyymIh75^N#<EzfYeA9SbUH=$s)^3WrY(YuUMKOlO#(lEs!aajn_=e
zK+{AkD0`J)My_rd{+oOJb-w7QkK6I5d+}J<Tjx=%4tDm{nV;_6ibco%40-fHA9d8t
zU-2W=O>F(Kz1u=)B{|HSm?xzH?`qYKVYT>gwfRU%VbIjskK$I6AG9Dm-R1OH{=W;*
z8rY^k+jnHxKHNK6I@O&>r(pVih9=c%$hD0jgTcg*#bDk1N-vAez<LMc;u{8e%r<CP
zs$Hz#!We_qZ5jgWz5_?Ww~CcMjIIq`$35%41#>;O0;!vFMYVTg&ROMDS>XKu;}qKl

delta 458
zcmYk&u};H43;@u(M3+m_q)F2>ZPP+qLV*Mr5FbD%Mi!XLdM8B2vaxjN!T<w0i65!h
z;aiwk_y!!~fs@X%pDbDSd-N6-=V9pIZ@zC=lCdxL?`4oL;6FUR7N={@lvui&D@WV4
zw_!>u_r-?V)1vlKe3BMO3nd^4K?0OENdyw2#3UV%HcCR$)lMCuq-y;)tOpb$Wz^IM
z>7Wcqh9C(_PBH@NqKrv)KvI-lk_ku;WlAyw$x!x`dxN_cKz*crYMN_V4^R$B4nc+}
zM<gXkj#4#pmn=u>_?nd`=7-O?ZDOn1URs})eN~RlvzWvlTzw^);50#QKg1a~rHq}t
TsdIB77hVNvU<EuiPjdbX&T(YB

diff --git a/apps/system/__pycache__/views_role.cpython-36.pyc b/apps/system/__pycache__/views_role.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..98edcd2011dc05d42e0592e099e1795e1f48adfc
GIT binary patch
literal 1472
zcmZux&2HQ_5GF;gB(Jr$ymf;HJrqTI*^2`tx1uNvq-c9c7J<|Dz%C%jBJF5F{g|Xu
z+el8%HF<&nJ@?*w--Fkjg1$jdo#Aehb!rJ54Tm%2H!~k~Z!#JG{ntOg{lN%%LpGif
z=!Y=uYY>u1s)@jFq-hh0h@#FkYq;P+=X%t{A_jdVW1TdqNQ0i}t!6C7!6((*O(wEt
zA|{mlNaU6rzaVm~QWaluu>+QEnSmu!*%cGJFrUaBnD2l`1Rgn9c4ZEhTus1ZPtwO^
zw)YkglKG5!{%fs%hi~?ibN!LBeb-ur^Pg4I>(VJ)e@np|jME3*Y26;Fv!OOhKCI8{
z7PmO+w3<bJ?{V46<L>;vQR}$(reAuwHdT1=y9c*Dgkf_KiU=x+h$IzEMgWre6n91d
zm$|*LPBnK77!IDeM$c#5r$y10jVcO1E{dj;gGN0oinF2A>y-&ag*<}mpTz9KQ9=BB
z_xo=ak4(2zmHVOAYGGIKA3j=?eQy`56Bke6cw2;X`wKIMXas8`5Gf7wn^W2chj%F{
zCOD)uTBo&xX>C*~DT-3-qL|NOvkhS;Loq>-fbb*8O=%yW)JjYHA%m5MaLgVEJkfFx
zDdjX+t|3Fjhv>42Oi~%WAW(1y1?N6PWDjcVu;>*=;DdYOxDUhL1%XkLowDbVBaXUg
z$(H<C^om?j$zRgv%#B>UOr9~A1G8UZGn2WGYUw$)#dE1_h0Fm~l$SY_Th~?T>aM-B
zv>kFPtGd>y))nreSF;p6>&khq0otl2Nq3Bmvp#-W>Oon<0GH<&?niQHdJE}rtMrLT
zj5<>T1Y+Wz8Ra%gh}HA#RJqSVu`vij$MhDx%r{GM01m*okGt~~cyH_#s1@4rDJ<NE
zv7$+2aDJ^B@0tG@to)xQB3?HnQ02qzF;j5&Nil@`G@m6OBSOBIPf&zp_ph<Pu*1no
zeSRb2uOa437@-76AfOQ1W>fP8eEe;>EZfuWAY2D1N2^R-9UPZd8KjBN*X#C4XIwS7
zRYS!7O<@Mf1gysYhryEjI56C<S{ql;tgbOBte7nnc<Tb8Lm>mMo09P9x2wOvclaj`
SJWr#H!W(4HraT`_)BgbAoL0a9

literal 0
HcmV?d00001

diff --git a/apps/system/__pycache__/views_structure.cpython-36.pyc b/apps/system/__pycache__/views_structure.cpython-36.pyc
index c8ea9d684805e8b31932848d7b54df7b0bdb3b55..7703ac18b247f20464d465129b4331cebe9c226b 100644
GIT binary patch
delta 16
XcmZ1}vr>lLn3tF9^4!-O*_HSJEAIs?

delta 16
XcmZ1}vr>lLn3tF9@A79G*_HSJEjR^R

diff --git a/apps/system/urls.py b/apps/system/urls.py
index 31d9576..c9f86b9 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path
 
 from .views import SystemView
-from . import views_structure, views_user, views_menu
+from . import views_structure, views_user, views_menu, views_role
 
 app_name = 'system'
 
@@ -27,4 +27,8 @@ urlpatterns = [
     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'),
 
+    path('rbac/role/', views_role.RoleView.as_view(), name='rbac-role'),
+    path('rbac/role/create/', views_role.RoleCreateView.as_view(), name='rbac-role-create'),
+    path('rbac/role/list/', views_role.RoleListView.as_view(), name='rbac-role-list'),
+    path('rbac/role/update/', views_role.RoleUpdateView.as_view(), name='rbac-role-update'),
 ]
diff --git a/apps/system/views_role.py b/apps/system/views_role.py
new file mode 100644
index 0000000..0abe1c9
--- /dev/null
+++ b/apps/system/views_role.py
@@ -0,0 +1,36 @@
+# @Time   : 2018/11/13 23:25
+# @Author : RobbieHan
+# @File   : views_role.py
+
+import json
+
+from django.views.generic.base import View
+from django.shortcuts import HttpResponse
+from django.views.generic import TemplateView
+
+from .mixin import LoginRequiredMixin
+from .models import Role
+from custom import SandboxCreateView, SandboxUpdateView
+
+
+class RoleView(LoginRequiredMixin, TemplateView):
+    template_name = 'system/role.html'
+
+
+class RoleCreateView(SandboxCreateView):
+    model = Role
+    fields = '__all__'
+
+
+class RoleListView(LoginRequiredMixin, View):
+
+    def get(self, reqeust):
+        fields = ['id', 'name', 'desc']
+        ret = dict(data=list(Role.objects.values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+class RoleUpdateView(SandboxUpdateView):
+    model = Role
+    fields = '__all__'
+    template_name_suffix = '_update'
diff --git a/db.sqlite3 b/db.sqlite3
index 09a81ca1a49707bde7f7236aa74e2f1166470659..2a8b9eb211276629ace11f9f912d2ef72fcea5a1 100644
GIT binary patch
delta 486
zcmZp8z|-)6XM!~2)`>FCj9WJ*ERh%C;P+tSpT~cJe>Z<5|7-q2{$75M&58;J{DS=4
z%*u?#mBl5gx$#B$IjKyWBlY)PU_1$wJ-|2p1|Q>dIbKx;RR+$d^LITL;$UasXHaBd
zFf}wX1|lOvBg5@?`5Dy}IGFgaG4p@mzqVO0;S|4_C=&~Vy6Cf+>s~g@dOl^vvySZ`
z)y51A41A0%4D$TX*DZWLq3!9!8HQXyF(&?p4EzuIKLhn%<(C&^R%b-f$;87f&k5JD
zEr7BAypW-Zf}ydMk%g6kg`SC#iKV6G_J#6H$q)EgIZrY09pY`_apUITJhj<SU<ap0
zlQk==ZwsqqN@iAahGB6<nPqaWVWD|$PKt4sNo9^<X_;|qT1G|1b^~r^Rz^t+gwdv!
zW+r9^P1Y=6{nHEOnH4~auCVa2@_R7w=knj-_u${oKM5FGX8fuu%)X3->|mXqE6+R~
zs6CB={}KOT{w4ga{Aoashwv-QF*`CE85mmV8XD>vVK{;nBt2b+hgoX+VtwXV0K-U>
A0ssI2

delta 226
zcmV<803H8;;0%D^43HZEtdSf;0j#lLq#qIo4_N{ao)6FuyAN3p>kn}cjk6J8Ll3iA
zFTT(L&$A&Qzz&z#4gu#L6D0s8014%vy62&Q=&ru!3<w7R4*(Sa05wi;Ze_RK4*@42
zvjkxLFScL-kG~QyIUq4LIx{vpH8n0WHa9jlGq<510%PC|1PcfN4#EwD3`PqGvoR3(
z3J8Kb1O-im1wof_9|It_Fbf0J1PBBVZ2%8#58Ss75Cb|7k+3J1Z65=d3<M8_01x61
c!w;kng|iW0bq@p{13>|oEDQr0m!mHOUGq&uyZ`_I

diff --git a/templates/system/role.html b/templates/system/role.html
new file mode 100644
index 0000000..529387d
--- /dev/null
+++ b/templates/system/role.html
@@ -0,0 +1,149 @@
+{% 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' %}">
+{% 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 class="btn-group pull-left">&nbsp</div>
+                    <div class="btn-group pull-left">
+                        <button type="button" id="btnDelete" class="btn btn-default">
+                            <i class="glyphicon glyphicon-trash"></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>操作</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>
+
+<script type="text/javascript">
+ var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.DEFAULT_OPTION,
+                {
+                    ajax: {
+                        "url": "{% url 'system:rbac-role-list' %}",
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+                        {
+                            data: "id",
+                            width: "5%",
+                        },
+                        {
+                            data: "name",
+                            //width : "20%",
+                        },
+                        {
+                            data: "desc",
+                            //width : "20%",
+                        },
+
+                        {
+                            data: "id",
+                            width: "16%",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "";
+                                var ret = "<button title='详情-编辑' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button title='关联用户' onclick='doUpdateUser("
+                                    + data + ")'><i class='glyphicon glyphicon-user'></i></button>";
+                                ret = ret + "<button title='关联菜单' onclick='doUpdateMenu("
+                                    + data + ")'><i class='glyphicon glyphicon-tree-conifer'></i></button>";
+                                ret = ret + "<button title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    $("#btnCreate").click(function () {
+        layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '300px'],
+            content: "{% url 'system:rbac-role-create' %}",
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+    });
+
+    $("#btnRefresh").click(function () {
+        oDataTable.ajax.reload();
+    });
+
+    function doUpdate(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        shadeClose: false,
+        maxmin: true,
+        area: ['800px', '400px'],
+        content: ["{% url 'system:rbac-role-update' %}" + '?id=' + id, 'no'],
+        end: function () {
+            oDataTable.ajax.reload();
+        }
+    });
+
+}
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/system/role_form.html b/templates/system/role_form.html
new file mode 100644
index 0000000..81b9f40
--- /dev/null
+++ b/templates/system/role_form.html
@@ -0,0 +1,80 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <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-8">
+                            <input class="form-control" name="name" type="text" />
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">描述</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="desc" type="text" />
+                        </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/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-role-create' %}",
+                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();
+
+        });
+
+        /*select 支持输入检索*/
+        $(function () {
+            $('select').comboSelect();
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/system/role_update.html b/templates/system/role_update.html
new file mode 100644
index 0000000..1ad33ff
--- /dev/null
+++ b/templates/system/role_update.html
@@ -0,0 +1,81 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ role.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-8">
+                            <input class="form-control" name="name" type="text" value="{{ role.name }}"/>
+                        </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">描述</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="desc" type="text" value="{{ role.desc }}"/>
+                        </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/combo-select/jquery.combo.select.js' %}"></script>
+    <script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+    <script type="text/javascript">
+
+        $("#btnSave").click(function () {
+            var data = $("#addForm").serialize();
+            $.ajax({
+                type: $("#addForm").attr('method'),
+                url: "{% url 'system:rbac-role-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();
+
+        });
+
+        /*select 支持输入检索*/
+        $(function () {
+            $('select').comboSelect();
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file

From 04d01aa2739a93a92db38c6ec983a6eae9cd8ce8 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Wed, 14 Nov 2018 18:49:00 +0800
Subject: [PATCH 4/9] role2uesr

---
 .idea/workspace.xml                           | 286 ++++++++++--------
 apps/__pycache__/custom.cpython-36.pyc        | Bin 2259 -> 2340 bytes
 apps/custom.py                                |   5 +-
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 1973 -> 2124 bytes
 .../__pycache__/views_role.cpython-36.pyc     | Bin 1472 -> 3179 bytes
 apps/system/urls.py                           |   2 +
 apps/system/views_role.py                     |  47 +++
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/system/role.html                    |  95 +++++-
 templates/system/role_role2user.html          | 105 +++++++
 10 files changed, 416 insertions(+), 124 deletions(-)
 create mode 100644 templates/system/role_role2user.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b374108..d6d17e3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
+      <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_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
+      <change beforePath="$PROJECT_DIR$/templates/system/role.html" afterPath="$PROJECT_DIR$/templates/system/role.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -16,7 +19,64 @@
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf>
+      <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="119">
+              <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="15" />
+              <folding>
+                <element signature="e#0#28#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="role_role2user.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="563">
+              <caret line="98" column="20" lean-forward="true" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
+              <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="952">
+              <caret line="56" column="53" lean-forward="true" selection-start-line="56" selection-start-column="53" selection-end-line="56" selection-end-column="53" />
+              <folding>
+                <element signature="e#73#84#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="527">
+              <caret line="70" column="32" lean-forward="true" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
+              <folding>
+                <element signature="e#78#89#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="role.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/role.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="502">
+              <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -66,13 +126,14 @@
         <option value="$PROJECT_DIR$/apps/system/views_structure.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$/templates/system/role_create.html" />
         <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
         <option value="$PROJECT_DIR$/templates/system/role_update.html" />
+        <option value="$PROJECT_DIR$/apps/custom.py" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
         <option value="$PROJECT_DIR$/templates/system/role.html" />
+        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
+        <option value="$PROJECT_DIR$/templates/system/role_role2user.html" />
       </list>
     </option>
   </component>
@@ -82,7 +143,7 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -133,11 +194,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="sandboxMP" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
@@ -159,7 +215,7 @@
   <component name="PropertiesComponent">
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-    <property name="last_opened_file_path" value="D:/PycharmProject/sandboxOA" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
@@ -171,10 +227,6 @@
     </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" />
@@ -182,6 +234,10 @@
       <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
       <recent name="D:\ProjectFile\sandboxMP\apps\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">
     <option name="ruleStates">
@@ -246,44 +302,31 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" 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.24156693" sideWeight="0.5042644" 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="true" show_stripe_button="true" weight="0.12948857" sideWeight="0.49573562" 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="false" show_stripe_button="true" weight="0.1936888" 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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14978679" 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.20095949" 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="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="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">
@@ -299,13 +342,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/base-layer.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="476">
@@ -584,14 +620,6 @@
         </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">
@@ -608,10 +636,50 @@
         </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">
+          <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$/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$/templates/system/role_update.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="657">
+          <caret line="80" column="14" lean-forward="false" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role_form.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="70" column="11" lean-forward="true" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
+          <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="272">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="25" selection-end-column="11" />
+          <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" />
+        <state relative-caret-position="289">
+          <caret line="69" column="39" lean-forward="true" selection-start-line="69" selection-start-column="39" selection-end-line="69" selection-end-column="39" />
           <folding>
             <element signature="e#559#654#0" expanded="false" />
             <element signature="e#690#758#0" expanded="false" />
@@ -629,94 +697,70 @@
         </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">
-          <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$/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="691">
-          <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$/templates/system/role_update.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="657">
-          <caret line="80" column="14" lean-forward="false" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-          <folding>
-            <element signature="e#78#89#0" expanded="true" />
-          </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="136">
-          <caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="9" selection-end-column="22" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/templates/system/role.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="657">
-          <caret line="145" column="1" lean-forward="true" selection-start-line="145" selection-start-column="1" selection-end-line="145" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/role_form.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="70" column="11" lean-forward="true" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
-          <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="578">
-          <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+        <state relative-caret-position="119">
+          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="15" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="70" column="32" lean-forward="true" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
+          <folding>
+            <element signature="e#78#89#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="952">
+          <caret line="56" column="53" lean-forward="true" selection-start-line="56" selection-start-column="53" selection-end-line="56" selection-end-column="53" />
+          <folding>
+            <element signature="e#73#84#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="223">
+          <caret line="75" column="26" lean-forward="false" selection-start-line="75" selection-start-column="26" selection-end-line="75" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="502">
+          <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="563">
+          <caret line="98" column="20" lean-forward="true" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/apps/__pycache__/custom.cpython-36.pyc b/apps/__pycache__/custom.cpython-36.pyc
index 1a6857e80e2b4704be9a709e57f768eb5c61b8a2..197c1ca6318ab6747b2da084b8e13034894663ae 100644
GIT binary patch
delta 188
zcmcaCxI~E4n3tE!^x5m^uNygYnHdEpmoradWZKNd;>yUVIyrzfo>6)823BQ8M!m^b
z*i?NK7#J8*8KM|d7^0X`7^9fm8PXV2m{OQqIHFkE8CV#iSc4ffS#AjiC+4Lj<yV9j
zq$HN4hGnLfSGj;lg|z%4g;J1UW?uSaQ8werdhAV%=94$Fs|v9d2>}f+k_8cRAVP2Q
dV|F86Qy{aL1xRo(vM^3o;8@2h%Ev9j4gh3ME*}5@

delta 154
zcmZ1?bXkzon3tDJzvE@};*FfS%#8e#%b6!JGH&K#ab;vwnH<0x&#1I{1FJG4qweG@
zY^tU*3=9mZ3{i|J3{gz&3~7uhj44bl98t{e3@i*$EWr$#%(n!C6Z2A%@+(3MQW8s2
z!!lFLCs(jHF`7;O&92JJS|kKCp-2`)$W1olFyb}=GK-mj1P9aPLXLH;B7EE;>;SBh
BBj*4B

diff --git a/apps/custom.py b/apps/custom.py
index fc91465..b7d92db 100644
--- a/apps/custom.py
+++ b/apps/custom.py
@@ -12,6 +12,7 @@ from system.mixin import LoginRequiredMixin
 
 
 class SandboxGetObjectMixin:
+
     def get_object(self, queryset=None):
 
         if queryset is None:
@@ -50,7 +51,7 @@ class SandboxCreateView(LoginRequiredMixin, SandboxEditViewMixin, CreateView):
 
 
 class SandboxUpdateView(LoginRequiredMixin, SandboxEditViewMixin, SandboxGetObjectMixin, UpdateView):
-
+    """View for updating an object, with a response rendered by a template."""
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        return super().post(request, *args, **kwargs)
\ No newline at end of file
+        return super().post(request, *args, **kwargs)
diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 0eaf445842abf907f5aae890033ad39d5231d087..ba70b304c4e1e8f521a4d36cea9c1a3c675c4899 100644
GIT binary patch
delta 228
zcmdnWe?~yrn3tDJ^vCPyxtt6Pj~S4F43O;r#Ko^RDj#IjOJz(kPUXl_$l_{dNHIy_
z=w$|qm;yx<!6IfLk#vbDr4;jE22G32?-*w@2UiIeB_$^77v<-q>ZhdUq?V-WR|$ZG
zbU{M85TPm&gd&izQE72%kxG>?LLFSxPg8kw59?e;=_tM+ph_38kztvs<x#vKzELPp
U=VVp(C`Pl%4eX{YLX1L;06y45tpET3

delta 78
zcmX>ju$5ogn3tDp>Xz5hcQ_ar9y1^TDInVch>MSHR6fYal`a;gkYXInplPyMh-o%6
Xv!ABoCbqeZllQQPF&a%4<}d{S#$yrs

diff --git a/apps/system/__pycache__/views_role.cpython-36.pyc b/apps/system/__pycache__/views_role.cpython-36.pyc
index 98edcd2011dc05d42e0592e099e1795e1f48adfc..8ad075c788d808d93d90db1c1d0523a82d9221a5 100644
GIT binary patch
delta 1721
zcmah}OK%)S5bo}I?0dc5T|WU~Y$O;6HgU`wL?l9TGYA`y7NPNGyY1{`_K}`m0oJUR
zXoCa?AHb0i@B={HLJnMW;8)BQ0TwxM&xx;Q9TVrmjHbG(y1J*kzOU*|;qLs(xl$>A
z``+D;w)2er&K`Ii=;!f8e}BF5!}cX6r)Bj9lU0>fVr)06lF3?Vb!v?oXVB|my))C8
zN%a}{XB)GeshKfr%wg@UoWt6=<F)gWZ!vHF)^DDD__H`WD!<nY)ddwQqdsV>Pg>&m
z7&b=w-lAjdKo};u6bF1Lq!sgkUv>2+jnZ0RdeaD#ddUiGX^;6>3@zgXZjgyB=^XGN
zJ7zec8w;6votd1;2ZdOS#$0A)?m*yB`OS+SPh72{L1^?W{&|m|Ax~TSe!IJ^pN4C{
z((L!ccB^UHz3y5N^|~I{i<t0=`VkC?{q8$k+lkd__7kh!HHi};+~^GE^kWp@?zTgt
zbmB_fdIZg)smDnyL3p-)0z;C~>e@g>MlYup&Jea?O~IOo3i<7RFESpqs0hJ$p4a&-
zuktM4ubs~9Dn)K$_X6THMe7n{F4O0r9^SEMMo&SZFCq-GLX(c`Pwy$?_bvyjg+cop
z&u_q4Cg&hh+VAvmk4fITQt1{JojkPBd3@0lgklXYSwl$Pup~gd!5RQcIv5@4Zn2S<
zNlJ9)_4lzakzw#CmgSf59R2vs(O19x@x|?<>o@<p`O}|Y{+hZ^*h1MQ(xz+)p-2vH
zFmPmtM#;gE9m9`VLJZ+x2=Pe_MJxjFWISRZOeV-eWkcKKVvs1v$JUq+9RsSwmMO*#
z7Fh?@&^4u)OFMSQ7MSB~rgT9TME|O1CAP*jl0s8TCDSZLNpaBiVNb06#ptuhsLmS2
z`6Si{(MajlE2a~A<;1%5_O{-@H72xqj<gksWQtPW*F8{3`H?b-)eOVLri4w%Wsx&4
z+q=6;t8PoBoYa&@{UU^yNy(+plH(N;uR<g_?BW+`??}H!-sQvVqBf#mzJV_)LohIF
z9{kGlGWfMWeF~{n(BT9O7r`fBd=KM+(xn{VhrtdUiR>byHedh~0F`}Q*02^vRM&1=
z*LIMR&K?^Js_NJVNI9zJ*wUYWx=fWE6j9~w0l&aLt_+<tqC{YEb}jsn$qcGKi>fc1
zsh|=I{4yu=Y0(#`=+nwRhETtZ6DPv-yb;&WK>xqGpPuCSA-JB!$`mtwhW5)KL23O`
zJ`<-Es;1U&QVjJ3y+&RO{CKb#jNtU#{{TxYv?jey@dRCB6JQTDgtVG3Vm6}wMg71A
zYIVG%)p><FL-jOvlg8klZVWi`wC~Ga%l9YOxZfrgU&6kWqlj?MTDHjMH2J)R!+-2=
z*Qsly+)ZjSXm<B{tF2zw==SB+=D=LhFVHkmadLZFh~`s2{LYzratTIO6gl2hR;;RB
OajMyhTP;kyuJ{)tAcctl

delta 91
zcmaDYae!Odn3tDp|CZO$^O+eK9y1^TRv_B}h>Pb;RG!V2!Whh;DY#jPQImy9Q)qHD
d_w>oCJW3KGKm{C3Jd8jHCIy&<SOi#wH~>;V4wwJ{

diff --git a/apps/system/urls.py b/apps/system/urls.py
index c9f86b9..9537e25 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -31,4 +31,6 @@ urlpatterns = [
     path('rbac/role/create/', views_role.RoleCreateView.as_view(), name='rbac-role-create'),
     path('rbac/role/list/', views_role.RoleListView.as_view(), name='rbac-role-list'),
     path('rbac/role/update/', views_role.RoleUpdateView.as_view(), name='rbac-role-update'),
+    path('rbac/role/delete/', views_role.RoleDeleteView.as_view(), name='rbac-role-delete'),
+    path('rbac/role/role2user$', views_role.Role2UserView.as_view(), name="rbac-role-role2user"),
 ]
diff --git a/apps/system/views_role.py b/apps/system/views_role.py
index 0abe1c9..b10f814 100644
--- a/apps/system/views_role.py
+++ b/apps/system/views_role.py
@@ -34,3 +34,50 @@ class RoleUpdateView(SandboxUpdateView):
     model = Role
     fields = '__all__'
     template_name_suffix = '_update'
+
+
+class RoleDeleteView(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(','))
+            Role.objects.filter(id__in=id_list).delete()
+            ret['result'] = True
+        return HttpResponse(json.dumps(ret), content_type='application/json')
+
+
+from django.shortcuts import get_object_or_404
+from django.contrib.auth import get_user_model
+from django.shortcuts import render
+
+User = get_user_model()
+
+class Role2UserView(LoginRequiredMixin, View):
+    """
+    角色关联用户
+    """
+
+    def get(self, request):
+        if 'id' in request.GET and request.GET['id']:
+            role = get_object_or_404(Role, pk=int(request.GET.get('id')))
+            added_users = role.userprofile_set.all()
+            all_users = User.objects.all()
+            un_add_users = set(all_users).difference(added_users)
+            ret = dict(role=role, added_users=added_users, un_add_users=list(un_add_users))
+        return render(request, 'system/role_role2user.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        id_list = None
+        role = get_object_or_404(Role, pk=int(request.POST.get('id')))
+        if 'to' in request.POST and request.POST['to']:
+            id_list = map(int, request.POST.getlist('to', []))
+        role.userprofile_set.clear()
+        if id_list:
+            for user in User.objects.filter(id__in=id_list):
+                role.userprofile_set.add(user)
+        res['result'] = True
+        return HttpResponse(json.dumps(res), content_type='application/json')
+
+
diff --git a/db.sqlite3 b/db.sqlite3
index 2a8b9eb211276629ace11f9f912d2ef72fcea5a1..5d4dbd983cc04c3d74f97299a370ae46669b570f 100644
GIT binary patch
delta 639
zcmYk2T}V@57{}lDocG<%v2D-1&|F#DauQB-J7?bmFQye;M1B;Bd7(!<y5Z*B=89dp
z(FffG3dQ<>APDMe7+wtY-kTA06I~b~l8&tlBT2Az(Yuw@d-3P_`28Pv|JiL_c3Zc6
z8kbhu2XN`_<STQl2zCx$z<bz$G587zcnFulzGk%;fwt@TKAgwTxi-59C-@GW%A^+6
z*hDfORY|LcmyQSNl$u;f#%Cf?mEK7>@(Blitl8q>8*HsLPi{ic#1rI0qw18A5Y&nG
zo)#+EXXQt4_8t@wLIzBb8Onv1<>mXkD^KJmHsfFi!44cS|2sHk;(eI8ch`-4C;s0}
ziU)(Zd9{g$DuVA&g(GJ81m`pYK^Rj)wFHTnP?5DF)z=Rj#t~Qz<LrwWeg57VuC$c9
zN?K5^3kg<zZh#(_dO-}CP)kR^!CVVdbJH{OL@KPv9<NQ3o$T3^i`QI=dsZHFhWc&S
zFI^eFl^#uBNOj+gdz@p7k=tI6H!~thBSZbEurDHq)Zw|vjiLTfUpTGI&qgCmWT)is
z?vbP($!(GRLD>~_2YNkz+3j;zHtv2|FT|9nD!JGtzc=9bIrF_|x${M<nfqXDqXK_Y
zRHkE*`Fdb~6F7n@OW-4PX$i)-A(RLjB4SLm8iGYk#XtByf*-ICKO2GBD9_?*h(LG|
yYa8W1vQ}pq`57#1Q(qFHq1rm#;5ax$a0oR<RX{@tk1%~*i*rUyi@%mQvicj@`llrT

delta 306
zcmZp8z|-)6XM!~2)`>FCj9WJ*ERh%C;P+tSpT~cJe>Z<5|7-q2{$75M&4LLA{F?mS
z%*u?#mBl5gx$#B$IjKxyY|Mr*fzsmCqJpCQw9K4TmgYkJ>4o}?Q`xRD^MByK2Go6u
z-%ON=g+X2P+01n>8)iM9vf^3Cc0(g$BVz^z20lg>26_JH>lQwr(DroV3_~uU7!&_P
z2L6ZqpMiR>@(T$vt23hLWZM4OpHXnbW|o4#{M>wD3{1SO4E&0`t(z4UDtV{3$}*ki
zD$&a-NM`{Wb$Yt0JX4mCfvJL#v6X?Pm5HUEfq{vEnbGux@=V^_73G<(3UIS<FpG00
orsQVkacyQy_%FYxKw#Si#-IF5EG)}^=Q9Z~vTXlT&&09;0Liyx)&Kwi

diff --git a/templates/system/role.html b/templates/system/role.html
index 529387d..accb09d 100644
--- a/templates/system/role.html
+++ b/templates/system/role.html
@@ -142,8 +142,101 @@
             oDataTable.ajax.reload();
         }
     });
+    }
 
-}
+    //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:rbac-role-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:rbac-role-delete' %}",
+                    data: {"id": id, 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 doUpdateUser(id) {
+        layer.open({
+            type: 2,
+            title: '绑定用户',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '600px'],
+            content: ["{% url 'system:rbac-role-role2user' %}" + '?id=' + id, 'no'],
+        });
+    }
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/system/role_role2user.html b/templates/system/role_role2user.html
new file mode 100644
index 0000000..332f7e9
--- /dev/null
+++ b/templates/system/role_role2user.html
@@ -0,0 +1,105 @@
+{% 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="selectUsersForm" action="" method="post">
+            {% csrf_token %}
+            <input type="hidden" name='id' value="{{ role.id }}"/>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-xs-5">
+                        <label class="control-label">可选用户:</label>
+                        <select name="from" id="multiselect" class="form-control" size="18" multiple="multiple">
+                            {% for item in un_add_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <div class="col-xs-2">
+                        <br><br><br><br><br><br>
+                        <button type="button" id="multiselect_rightAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-forward"></i></button>
+                        <button type="button" id="multiselect_rightSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-right"></i></button>
+                        <button type="button" id="multiselect_leftSelected" class="btn btn-block"><i
+                                class="glyphicon glyphicon-chevron-left"></i></button>
+                        <button type="button" id="multiselect_leftAll" class="btn btn-block"><i
+                                class="glyphicon glyphicon-backward"></i></button>
+                    </div>
+                    <div class="col-xs-5">
+                        <label class="control-label">{{ role.name }}-已绑定用户:</label>
+                        <select name="to" id="multiselect_to" class="form-control" size="18" multiple="multiple">
+                            {% for item in added_users %}
+                                <option value="{{ item.id }}">{{ item.name }}({{ item.username }})</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-xs-12 margin-top-5">
+                        <p class="text-maroon">*注意：一个用户可以添加到多个角色中,继承多个角色的权限</p>
+                    </div>
+                </div>
+            </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/select/multiselect.min.js' %}"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //初始化多选列表
+            $('#multiselect').multiselect({
+                search: {
+                    left: '<input type="text" class="form-control" placeholder="Search..." />',
+                    right: '<input type="text" class="form-control" placeholder="Search..." />',
+                },
+                fireSearch: function (value) {
+                    return value.length > 3;
+                }
+            });
+
+
+        });
+
+        $("#btnSave").click(function () {
+            $('#multiselect_to option').prop('selected', true);
+            var data = $("#selectUsersForm").serialize();
+            console.log(data);
+            $.ajax({
+                type: $("#selectUsersForm").attr('method'),
+                url: "{% url 'system:rbac-role-role2user' %}",
+                data: data,
+                cache: false,
+                success: function (msg) {
+                    if (msg.result) {
+                        layer.alert('操作成功！', {icon: 1}, function (index) {
+                            parent.layer.closeAll();
+                        });
+                    } else {
+                        //alert(msg.message);
+                        layer.alert('操作失败', {icon: 2});
+                    }
+                    return;
+                }
+            });
+        });
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+    </script>
+{% endblock %}

From 134ea4426f9133d90e6720b9cf33298b268eb2c2 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Wed, 14 Nov 2018 19:56:01 +0800
Subject: [PATCH 5/9] role2user

---
 .idea/workspace.xml       | 106 +++++++++++++++++++++-----------------
 apps/system/views_role.py |  12 ++---
 2 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d6d17e3..1e8045a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <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_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change beforePath="$PROJECT_DIR$/templates/system/role.html" afterPath="$PROJECT_DIR$/templates/system/role.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -32,11 +28,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="role_role2user.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="role_role2user.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="563">
-              <caret line="98" column="20" lean-forward="true" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
+              <caret line="98" column="20" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -45,8 +41,8 @@
       <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="952">
-              <caret line="56" column="53" lean-forward="true" selection-start-line="56" selection-start-column="53" selection-end-line="56" selection-end-column="53" />
+            <state relative-caret-position="221">
+              <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
               <folding>
                 <element signature="e#73#84#0" expanded="true" />
               </folding>
@@ -54,11 +50,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/apps/system/models.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="527">
-              <caret line="70" column="32" lean-forward="true" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
+              <caret line="32" column="84" lean-forward="true" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="597">
+              <caret line="78" column="77" lean-forward="true" selection-start-line="78" selection-start-column="77" selection-end-line="78" selection-end-column="77" />
               <folding>
                 <element signature="e#78#89#0" expanded="true" />
               </folding>
@@ -70,7 +76,7 @@
         <entry file="file://$PROJECT_DIR$/templates/system/role.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="502">
-              <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+              <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -132,8 +138,8 @@
         <option value="$PROJECT_DIR$/apps/custom.py" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
         <option value="$PROJECT_DIR$/templates/system/role.html" />
-        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
         <option value="$PROJECT_DIR$/templates/system/role_role2user.html" />
+        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
       </list>
     </option>
   </component>
@@ -143,7 +149,7 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -194,6 +200,12 @@
               <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" />
@@ -302,7 +314,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" 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" />
@@ -602,16 +614,6 @@
         </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#0#28#0" expanded="false" />
-          </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">
@@ -702,7 +704,7 @@
         <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" />
+            <element signature="e#0#41#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -717,26 +719,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="70" column="32" lean-forward="true" selection-start-line="70" selection-start-column="32" selection-end-line="70" selection-end-column="32" />
-          <folding>
-            <element signature="e#78#89#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/custom.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="952">
-          <caret line="56" column="53" lean-forward="true" selection-start-line="56" selection-start-column="53" selection-end-line="56" selection-end-column="53" />
-          <folding>
-            <element signature="e#73#84#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="223">
@@ -748,19 +730,47 @@
     <entry file="file://$PROJECT_DIR$/templates/system/role.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="502">
-          <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+          <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
           <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="527">
+          <caret line="32" column="84" lean-forward="true" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="e#73#84#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="563">
-          <caret line="98" column="20" lean-forward="true" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
+          <caret line="98" column="20" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="597">
+          <caret line="78" column="77" lean-forward="true" selection-start-line="78" selection-start-column="77" selection-end-line="78" selection-end-column="77" />
+          <folding>
+            <element signature="e#78#89#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/apps/system/views_role.py b/apps/system/views_role.py
index b10f814..3e43c34 100644
--- a/apps/system/views_role.py
+++ b/apps/system/views_role.py
@@ -5,13 +5,17 @@
 import json
 
 from django.views.generic.base import View
-from django.shortcuts import HttpResponse
+from django.shortcuts import HttpResponse, get_object_or_404
 from django.views.generic import TemplateView
+from django.contrib.auth import get_user_model
+from django.shortcuts import render
 
 from .mixin import LoginRequiredMixin
 from .models import Role
 from custom import SandboxCreateView, SandboxUpdateView
 
+User = get_user_model()
+
 
 class RoleView(LoginRequiredMixin, TemplateView):
     template_name = 'system/role.html'
@@ -47,12 +51,6 @@ class RoleDeleteView(LoginRequiredMixin, View):
         return HttpResponse(json.dumps(ret), content_type='application/json')
 
 
-from django.shortcuts import get_object_or_404
-from django.contrib.auth import get_user_model
-from django.shortcuts import render
-
-User = get_user_model()
-
 class Role2UserView(LoginRequiredMixin, View):
     """
     角色关联用户

From 1f94ffa857f45cc32661f2d958d9317d228590d0 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Wed, 14 Nov 2018 23:40:06 +0800
Subject: [PATCH 6/9] role2menu

---
 .idea/workspace.xml                           | 181 ++++++++++--------
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 2124 -> 2294 bytes
 .../__pycache__/views_role.cpython-36.pyc     | Bin 3179 -> 4662 bytes
 apps/system/urls.py                           |   4 +-
 apps/system/views_role.py                     |  39 +++-
 db.sqlite3                                    | Bin 208896 -> 208896 bytes
 templates/system/role.html                    |  13 ++
 templates/system/role_role2menu.html          | 179 +++++++++++++++++
 8 files changed, 330 insertions(+), 86 deletions(-)
 create mode 100644 templates/system/role_role2menu.html

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e8045a..b33ee44 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/views_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
+      <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
+      <change beforePath="$PROJECT_DIR$/templates/system/role.html" afterPath="$PROJECT_DIR$/templates/system/role.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -15,12 +18,12 @@
     <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <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="119">
-              <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="15" />
+            <state relative-caret-position="601">
+              <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -28,12 +31,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="role_role2user.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
+      <file leaf-file-name="role_role2menu.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/role_role2menu.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="563">
-              <caret line="98" column="20" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-              <folding />
+            <state relative-caret-position="2097">
+              <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
+              <folding>
+                <element signature="e#1424#1456#0#HTML" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -42,7 +47,7 @@
         <entry file="file://$PROJECT_DIR$/apps/custom.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="221">
-              <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+              <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
               <folding>
                 <element signature="e#73#84#0" expanded="true" />
               </folding>
@@ -53,18 +58,18 @@
       <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/system/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="32" column="84" lean-forward="true" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
+            <state relative-caret-position="404">
+              <caret line="32" column="84" lean-forward="false" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="597">
-              <caret line="78" column="77" lean-forward="true" selection-start-line="78" selection-start-column="77" selection-end-line="78" selection-end-column="77" />
+            <state relative-caret-position="414">
+              <caret line="92" column="32" lean-forward="true" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
               <folding>
                 <element signature="e#78#89#0" expanded="true" />
               </folding>
@@ -72,11 +77,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="role.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="role.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/templates/system/role.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="502">
-              <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+            <state relative-caret-position="217">
+              <caret line="229" column="25" lean-forward="false" selection-start-line="229" selection-start-column="13" selection-end-line="229" selection-end-column="25" />
               <folding />
             </state>
           </provider>
@@ -136,10 +141,11 @@
         <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
         <option value="$PROJECT_DIR$/templates/system/role_update.html" />
         <option value="$PROJECT_DIR$/apps/custom.py" />
-        <option value="$PROJECT_DIR$/apps/system/urls.py" />
-        <option value="$PROJECT_DIR$/templates/system/role.html" />
         <option value="$PROJECT_DIR$/templates/system/role_role2user.html" />
         <option value="$PROJECT_DIR$/apps/system/views_role.py" />
+        <option value="$PROJECT_DIR$/templates/system/role_role2menu.html" />
+        <option value="$PROJECT_DIR$/apps/system/urls.py" />
+        <option value="$PROJECT_DIR$/templates/system/role.html" />
       </list>
     </option>
   </component>
@@ -150,10 +156,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
+    <option name="x" value="-1448" />
     <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1056" />
+    <option name="width" value="1456" />
+    <option name="height" value="876" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -200,12 +206,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" />
@@ -314,17 +314,16 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="-1448" y="-8" width="1456" height="876" extended-state="6" />
     <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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32882273" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12948857" sideWeight="0.49573562" 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="false" show_stripe_button="true" weight="0.270636" sideWeight="0.49573562" 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.32882273" 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.32882273" sideWeight="0.5" order="7" 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.20095949" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21380244" 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.20558739" 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" />
@@ -332,13 +331,27 @@
       <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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12948857" sideWeight="0.49573562" 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="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.20095949" 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="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="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" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -354,13 +367,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/templates/base-layer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="22" lean-forward="true" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/base-left.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="483">
@@ -557,9 +563,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
           <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#70#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -709,16 +712,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="119">
-          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="15" />
-          <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="223">
@@ -727,32 +720,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/role.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="502">
-          <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
-          <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="527">
-          <caret line="32" column="84" lean-forward="true" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/custom.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
-          <folding>
-            <element signature="e#73#84#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="563">
@@ -761,16 +728,62 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="601">
+          <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#28#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
+          <folding>
+            <element signature="e#73#84#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role_role2menu.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2097">
+          <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
+          <folding>
+            <element signature="e#1424#1456#0#HTML" expanded="true" />
+          </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="404">
+          <caret line="32" column="84" lean-forward="false" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="597">
-          <caret line="78" column="77" lean-forward="true" selection-start-line="78" selection-start-column="77" selection-end-line="78" selection-end-column="77" />
+        <state relative-caret-position="414">
+          <caret line="92" column="32" lean-forward="true" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
           <folding>
             <element signature="e#78#89#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/role.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="229" column="25" lean-forward="false" selection-start-line="229" selection-start-column="13" selection-end-line="229" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index ba70b304c4e1e8f521a4d36cea9c1a3c675c4899..917b65a117791c880959f2cf94e4aeeb5d6b50c6 100644
GIT binary patch
delta 276
zcmX>j@J&#~n3tEU&+<)lAr}L~V+JH32V^?{aWNm$MwKUwdZ~;l=BXT6N?BaZ3@H{V
z9KFmy5lf(mGFZe4B$6%_rIKPD%%EwrS%~Q>bG?3*a8XiXvTjj+PAZr%DlJYesuBSS
z>VpKqgi&s4UMZ$hkZ6@87NzkynZ+ggRT5}MgVcki{4`Z>ai?S@=51zU+r}st#Tx{)
j$;cNd9hR9|9wi9p`T)(Dyn{W8(Q2|Vhb4;;qYxti6SY)V

delta 102
zcmew+ct$|Qn3tDJ^vCPyxtt6Pj~S4F43O;r#Ko@|H>x~g<Vu%_Qc5uoX3(_QY{qnz
rSyH7+xF{(xS+^)ZClyQ>l@_NK`DrR|ZeiQQI5~+UjL~fJP7X@|22>k@

diff --git a/apps/system/__pycache__/views_role.cpython-36.pyc b/apps/system/__pycache__/views_role.cpython-36.pyc
index 8ad075c788d808d93d90db1c1d0523a82d9221a5..f66068b4f477b06a6d5aa6c4aea802fbace668db 100644
GIT binary patch
literal 4662
zcmb_f&2JmW72l89<&q*Lik3elyQ!O`A3_{Cb=;4nt}DQ<9kjOM+D-~=Rjg^w$X<Gv
zq-TbyEl@xTrGR@-f);5D1ikds^wL9n$f5tqTnpC@(7zz3{@yG}kqV9EPzgJndHZH|
z=DpwVy*IDcYL%B?`|mHFEI7`;or%8y{dGL5;yMm@xSKgK{d$?3d$H$I-_QJ<#Vilv
zz>ZlK=B2n~`#~1v<+yD7A@nLS7UCryWpjBouG)S%tL5|Ye7+DbSiMSC&llsxyb(8C
zN0fJ+_|RpC&++Pe4zG%;DDAR%36dJ0hh$zX?)vdzj2Czv<2p1vXdHoLkvAY|hz2x{
zVtj}%VZ1cdI0ngKegu*uL&-8ENBJ>GjtwO%kSy~RNLGfD<J`UBtRDZAjI^=p8uoT7
zezoeE>Kj`3t_#)cc9bxScZ5#5x7(tHADNte<t$XIH$~pdnp)T?u9+vLz7jIYyIf?@
z2&L$7AwPw&9Sj>+x_8pfb#cF+O2MzD57G|4#IAQUVc1pC>0`8bquJrNyALi%F<f~p
zdaK8Wq89CT^hb-Y<56`q!iin(#2$BJpL;l&Zz5Wswzyqa50w`AX$isFU7cqetIR}6
z(rM-*NlYc7jrTL^SCiy^znKl+)G*7Q)T;i?k%#ap+kAHB;_I8&WS1;+Db2*DDz<<1
z+GexYQ=7#XH{ZeMRbs!}dno5Idx>`Jp^02Oo_!?J8XZaaF~hNf;j!lFSQAz%B}p^O
zl4N5wlz_b>$sBT#nhF{dSf`k9D-{`6`zI)R^dWf|%`rTRp^04PTFKPTXvgcMGPyJE
za_>C{2KQlbW~#KaE2+|C^cKyaKU$NX3wYESG&GC*cl;esJKEJ=+i$ah_rA01a<=F0
z_&U&GyEO1I4tTgn&Ma*hFXe`jTMXkuwFt35MRU6jb7yI*snc%fbX#>h1khHuqeVw2
z`e9G3M$k-K+OP~;D{N9KAgxUJPBZHZC4KD6Fq&=x-p_jq$6-ojTX9K>`=XDDWFX^9
zp(jj8#xOqM|5bEUh{ka%?h$vpK52?IC;)K>z4J|IPpoC3W!<ri7hl0sz{Ha@o^r+*
z`Lw6c!z2!e4zW<#XOBDrbyG_EmQNe2rGq;nyvU=}*uySOp+8amt*!LI%pHFVbH0wp
znt%WV2$5`R*Ix!gcE=Y*CW_!P8$`FTvbHb+TmYqk+jj4Ta)W-kzwF2j?P)8eQJZnL
z>+X64thNOf5BA)4wCf;BhXaq7&N;fQEA6>~2gpUdY#~?KxKso()z7qC!6!d+Pmv_$
zNs@MM%2N={LZ5sNFIKCPAYs_GH*efDe%|aEKkaA}D1fy9q5K*tfR>pS(u4?{IJ5<#
zd;xFdi?j@rWL85U1WdL3h8<xG7R%#kBrOnGudDRS&`?!0gv2FavEfGU_94RKzFpTy
za|R^8hiNk%{1RT!GlC@bXFK;K-i#nw1Y_<aM!*R?z%Lk0d^R=O(3!W8G$>f~PheK%
zB>tZM_4iMI`;W)J`RCJLfB59XkN@-N6DuAAp#()r<`?j&3=MbTb_ediMZesI`)^TH
zu>c_FyKp`t&Yrj94ZJoWu<HN{rFLX{OqU0MN4rAtW+%`9!NAwmL4Y~_p1%|7+5mBB
z5bjcp3pOkg00Xag4=IL8oWjgCITze!KxL}^PJ(eU+FqH+JT?uSp*(4G(CWPLFaP+a
zq}XVqlKeLHC@Po*((1`Bz#$SPwDA$*4I^_Eu<=P);px_vK&ovCi#B<Z79b0O+JqbV
z9co^u<_Bm@nGyvpt>ifp5}GF5ZG#VepOh6PD+dTV1{_t~dEjV!amr~F*2aFJ*f;je
zM;J^Hl<Yn72x|u%mWFj1JOWI>Yivkfj4XLW>pRvi@!*cL>k)Ma4E{n1<vIgjzWd;L
zqHDW4@R1+fi_S0WJAu`xk>6bBe)e+|XP|ZjYR~J1cHL6D%qy1Kb3|>+-=R0<YuK>y
zbQj_^biat)i-oxlc<wZ2TKCCUXt@&1V_ABhMnNkRO)1w&hlnp<C8-aj9He}>?>b61
zN`9Br$%%%M?+!YQIC~L~qUcVfXK>jP{;9X*)`|X&X~z}pKUgjxGbFs*N|NFb&x{4%
z$7g6yMX>jo7nLQ+{txkhYQb6Y;K{#!_xSH0J^kR%kN5sC9S_I{^w@Z?j?Oq9oEyi3
zbA-OpsE7nW7!rrAHkjqNPyFW2B*!f(fCw`E3?k>)YeD2d{tzk?M5fSR@UV#A6Fhtt
z<=(~=6`>)@HQ>7;*+v$bBHL6De1tjsWE&n8CE2oLDduZXZr~vE`9v=SIX3Xy2!BMT
z2WJNi^f?9kATVP_>0TtyV~sM#qZLA{UqJ{YYMq~;)*RNZei>>pErl?p)?LxMC-@i9
zt9FoHmRT?0oF>S+O%$;d*UVf`$UIdFg`bj_Adz#_T&BjS=0!A9k?;+Y+HiOUJ;TU_
zah2L+xV2g2+Jvqxdx=~P>zs;P1+gZmHFnc%YRR9_mnpQ$XVU7Yczc~bMWHnEnHz<Y
zWV2~CS@}(;S%R=BA~o%5RFC&5>J%yV{ZAf$@W<_&a7n?a$B+K>^e-Pz^NJug=GD6x
z>{sn$hFu$RN?y}$8+AO50ka~yqml=32z;pRcbE=!i83t}UpqnPIUQjJB04fGy$K7w
z(R*Fd6yGTehrDE?c2wkEc^sQDVXuk2r@_t@4Dmzt^0TY4TES3T-`ePFUGXO7$mglC
zggr?;3!xuT&q9bm_jw$V@hy(x3KakeAxPP58V5yxx-zq#&oRkfRY!#xAmmYrwtd(}
z=SgQ3H-_L~eZG&P{q=3nX6~Qi11Wuk{6+whBw0OS%Sp4$+s)3M?wY-kV*QSgX>09v
z6B&gHb5kF_S9iNoxB9xc6WO2^FU^`ODczex!&h|UlIiWWW?$cxgkT&0aQURmzATe!
zXfL9wsCCHBCT!ti)y*Z9tFlJTIyF>z*c+(5`Phque2HX~Wh^J`$tJiuHiC)H6<7K5
gv^z!4jXdINmHut7?uCAX)q_S<4;yoh6OE()19d0z7ytkO

delta 1469
zcmZ`(yN?@17~k2)?0RqgJlkjAk>o-wktHudLbwDjq#{v@=yaSYmcp_;bEieSUi0lb
zK{Qt!EfUc*{0lS)34~~oXeep7LV_lwp-n2jZ+u{55nJ=~_nz-H{$cQ}H@IG{`ro~H
z_R)cF7{41!9|!5Xc=A7uCxh){W(Y&riIeh(Bkc&DxTzO;ns$>)>PNn|@shPPh=Q~l
zRhe<m5EbEnZU|p`lAqX74JB(LKuI8j6Dz7CUlldvYiMDjMFS;u(LhN<R?(t~d{Z2^
zP|!LxX$eEDCsw*1t?Mh>NjvRC9Zh#o-i^A<kew4F+Cb;7*g)TnQ{SFo9~fcpDOLI~
zWTpLKEFa@<aK9*~`!b(qlUx#iAk%3wDkSNjGWCRQx@f(hB~ty!zUFoGhq^j4cbeEa
zqk$(k5j+OI`qtcguto*}L6yKoD4jGDGAa3CEEAE#JO*hsMKPd>(8iP72p+Q;G}W)Q
zzWT)sRAzn8Ts5$F&XPrGfh?9{kb7wz$zn@=W)E(y+<yVJOU8=}JE-X6nP+c82ea?1
zzwB$5S`^S7&ZYv}@Gx{?B_x#u>jZ7}z}XD{ubcs@&*RBC0+oXW4VDV3tDl^&+Few>
zV3)D&JQl-YJUM`iD&;+I6BS_qTj~qG#r1t>)Hl4pdk*EWO-dUmeCdMxWG3?hUez2%
zNn+#{De3Om(=0DSWxH4ItkiNH-IlBu?RgCqbpB}%(IHcNtlO_)uZOc-!cdQuvIjX4
z64aMYSDm=Ov91!{UgHME*2!NX>Vo>&+ZJb#EUjD?r7z;cLy4Ya30q|F3c*bTY&jJN
zZxGxfxQ$R&MoFUY&EXvqQproX>ouZr@2dNiKh9nxEj2h~u!BFPS!77Qj^t^Vk9C)u
z^UGI~y+q!6cP^8!izVyE?h@yW6FCBSk8G$OxJFWIBm`K*E~dm6h0xmO@FwZ0q|%=C
zu!XDn(>&f+&;6VG{~Z+W<4|Pd;c%YROUL#$`ct*@y|Zl7s{qNuKAck<&D*1>Ej}Ji
zj<Tzd@O|f3kK{x`JO+Ao_)OzZ;|b8pmR!#^pTA!|p5;ZBf`=NY5YXG#Zx-ks0j)dG
ziogvuY4)SHh@?@@n?xBbRr>FimEOB}%`B03=wCPAM)1sl;a6kBYS|5^<u!O~Z7${J
E-%cnUkN^Mx

diff --git a/apps/system/urls.py b/apps/system/urls.py
index 9537e25..e7d858f 100644
--- a/apps/system/urls.py
+++ b/apps/system/urls.py
@@ -32,5 +32,7 @@ urlpatterns = [
     path('rbac/role/list/', views_role.RoleListView.as_view(), name='rbac-role-list'),
     path('rbac/role/update/', views_role.RoleUpdateView.as_view(), name='rbac-role-update'),
     path('rbac/role/delete/', views_role.RoleDeleteView.as_view(), name='rbac-role-delete'),
-    path('rbac/role/role2user$', views_role.Role2UserView.as_view(), name="rbac-role-role2user"),
+    path('rbac/role/role2user/', views_role.Role2UserView.as_view(), name="rbac-role-role2user"),
+    path('rbac/role/role2menu/', views_role.Role2MenuView.as_view(), name="rbac-role-role2menu"),
+    path('rbac/role/role2menu_list/', views_role.Role2MenuListView.as_view(), name="rbac-role-role2menu_list"),
 ]
diff --git a/apps/system/views_role.py b/apps/system/views_role.py
index 3e43c34..f47f330 100644
--- a/apps/system/views_role.py
+++ b/apps/system/views_role.py
@@ -11,7 +11,7 @@ from django.contrib.auth import get_user_model
 from django.shortcuts import render
 
 from .mixin import LoginRequiredMixin
-from .models import Role
+from .models import Role, Menu
 from custom import SandboxCreateView, SandboxUpdateView
 
 User = get_user_model()
@@ -79,3 +79,40 @@ class Role2UserView(LoginRequiredMixin, View):
         return HttpResponse(json.dumps(res), content_type='application/json')
 
 
+class Role2MenuView(LoginRequiredMixin, View):
+    """
+    角色绑定菜单
+    """
+    def get(self, request):
+        if 'id' in request.GET and request.GET['id']:
+            role = get_object_or_404(Role, pk=request.GET['id'])
+            ret = dict(role=role)
+            return render(request, 'system/role_role2menu.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        role = get_object_or_404(Role, pk=request.POST['id'])
+        tree = json.loads(self.request.POST['tree'])
+        role.permissions.clear()
+        for menu in tree:
+            if menu['checked'] is True:
+                menu_checked = get_object_or_404(Menu, pk=menu['id'])
+                role.permissions.add(menu_checked)
+        res['result'] = True
+        return HttpResponse(json.dumps(res), content_type='application/json')
+
+
+class Role2MenuListView(LoginRequiredMixin, View):
+    """
+    获取zTree菜单列表
+    """
+    def get(self, request):
+        fields = ['id', 'name', 'parent']
+        if 'id' in request.GET and request.GET['id']:
+            role = Role.objects.get(id=request.GET.get('id'))
+            role_menus = role.permissions.values(*fields)
+            ret = dict(data=list(role_menus))
+        else:
+            menus = Menu.objects.all()
+            ret = dict(data=list(menus.values(*fields)))
+        return HttpResponse(json.dumps(ret), content_type='application/json')
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index 5d4dbd983cc04c3d74f97299a370ae46669b570f..3c1ad8285df967f99424da6f34c0a6c9c9a38807 100644
GIT binary patch
delta 697
zcmYL`&1(};6vf}2cVA}SOwuzUr3RDIG$2$#8$@&=(t?{Vb?GkuKo|Z2LN<yUp%tNi
zfGD_dRVc9;{6KVRS4CGEkwUN`aZ$A&V2a><6G`X7T!we<Z_Yihv6XFXWtU3SUM^pz
z_FDbfR53)(!((jXHLl?YuHz0Ca0<ERbmiBWDdqG<TDf|Ij%C7fR$rnOdgK);YA(#a
zc~|hTt1!SWHb%9c*Dq~zJ|39!8MZ`0pp=>=-<LK+nT)h)GDg~QVwP4QoeI6su(f1g
z5Y;05R30|8P}|LX{jK;RR#W-z>eKGht?$eC&z_5A_=MViu-a=p?B096eLE4BJaMu&
zM{ztpvi1R^64V+ln1GcfXRBt(**a;-*{WJ{wn|ohrPR13Z9=E?*h;glI`I|39w;2*
z0H2Rau<tR)dI+sL<fH=@9j@SDW9~3?FB{6IhkXax$H$`*$Sa&N`hQ|GX<*efuW}mK
zM4DEtox~fmTAReRETcpCjlNt&M<|~#X(Co+O-2?aGHiUe1}k>!*jDUuWjHjDu@3s_
z(CG}51Q7X5ZYD_YgngA>O6XiOdL*6?v4dWcpZC6@8aXqPr!3~HbjP8v@7C*!ct_Y@
uFyW3;EeCFb{Z!kkd;COm6s-IDFT~QK!XmyR!QCW|^&T|iX5v@$AN&K8my3@8

delta 369
zcmYL_F-rqM5QTScXYX#~;X6TsVjxkp&?f1u#KI<}o!A|Mc0&9IDQyG=QB)8?MJrJb
zbA=XG7N$vOkszre#v&rIh#GNoAT}Q}ypK09#kyCldz&Lv-b&3;`6@U`CpD%l9HN37
zEaDYw*gzgr;b_i>N_ldIcIm(xA|2+lw|5~Ix;Q1u^$8&?R3+X}4F`gIj15Z`(_&$H
z$!8W5qOo`JQrv&uK5wi?#_cB-QG1qr|CkH@83!~Ua`2trxg<NXEA*31NHhiB(L~1-
z){wMa7DS4b!$K1)ZC0&HzQvh8w}Yl}A2I1L5yepK+N_D#v6(a}oiNuWS^^(v;WMrt
zSJD*6a9L_{;_=`7>bb^z!k|fdA-gf1o~=uP#Ya-<higZ6;VI+=R#7u=iz45bZAgWc
J$jQhKegQL)R}%mL

diff --git a/templates/system/role.html b/templates/system/role.html
index accb09d..c71d519 100644
--- a/templates/system/role.html
+++ b/templates/system/role.html
@@ -237,6 +237,19 @@
             content: ["{% url 'system:rbac-role-role2user' %}" + '?id=' + id, 'no'],
         });
     }
+
+    //关联菜单
+    function doUpdateMenu(id) {
+        layer.open({
+            type: 2,
+            title: '权限分配',
+            shadeClose: false,
+            maxmin: true,
+            area: ['600px', '480px'],
+            content: ["{% url 'system:rbac-role-role2menu' %}" + '?id=' + id, 'no'],
+
+    });
+    }
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/system/role_role2menu.html b/templates/system/role_role2menu.html
new file mode 100644
index 0000000..10b0ef1
--- /dev/null
+++ b/templates/system/role_role2menu.html
@@ -0,0 +1,179 @@
+{% extends "base-layer.html" %} {% load static %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/metroStyle/metroStyle.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/zTreeStyle/zTreeStyle.css' %}" type="text/css">
+    <link rel="stylesheet" href="{% static 'plugins/zTree/css/demo.css' %}" type="text/css">
+{% endblock %}
+{% block main %}
+
+    <style type="text/css">
+        .ztree li span.button.switch.level0 {
+            visibility: hidden;
+            width: 1px;
+        }
+
+        .ztree li ul.level0 {
+            padding: 0;
+            background: none;
+        }
+
+
+    </style>
+    <div class="box box-danger">
+        <div class="box-body">
+            <form class="form-horizontal" id="addTreeForm" action="" method="post">
+                {% csrf_token %}
+                <!-- 注释1：页面实例是由Role2MenuView视图返回的，同时传递了上下文role,这里使用role.id时用来提交POST请求时向后台传递的id-->
+                <input type="hidden" name='id' value="{{ role.id }}"/>
+                <input type="hidden" name="tree" id="tree" value=""/>
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-xs-5">
+                            <div class="row span7 text-center ">
+                                <label class="control-label"><h5>所有菜单</h5></label>
+
+                            </div>
+                            <div style="zTreeDemoBackground:left">
+                                <ul id="left_tree" class="ztree"></ul>
+                            </div>
+                        </div>
+                        <div class="col-xs-2">
+                            <br><br><br><br><br><br>
+                            <div class="text-center">
+                                <button type="button" id="btnSave" class="btn btn-info margin-right ">生成</button>
+                            </div>
+                            <div class="text-center text-gray margin-top-5">{{ role.name }}权限</div>
+
+                        </div>
+                        <div class="col-xs-5">
+                            <div class="row span7 text-center">
+                                <label class="control-label"><h5>已选菜单</h5></label>
+                            </div>
+                            <ul id="right_tree" class="ztree"></ul>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    <script type="text/javascript" src="{% static 'plugins/zTree/js/jquery.ztree.core.js' %}"></script>
+    <script type="text/javascript" src="{% static 'plugins/zTree/js/jquery.ztree.excheck.js' %}"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            var zTree;
+            var demoIframe;
+
+            var left_tree_setting = {
+                view: {
+                    dblClickExpand: false,
+                    showLine: true,
+                    selectedMulti: true
+                },
+                check: {
+                    enable: true,
+                    //chkboxType : { "Y" : "", "N" : "" }
+                },
+                data: {
+                    key: {
+                        name: "name",
+                        //title:"title",
+                    },
+                    simpleData: {
+                        enable: true,
+                        idKey: "id",
+                        pIdKey: "parent",
+                        rootPId: ""
+                    },
+                }
+            };
+
+            var right_tree_setting = {
+                view: {
+                    dblClickExpand: false,
+                    showLine: true,
+                    selectedMulti: true
+                },
+                check: {
+                    enable: false,
+                    //chkboxType : { "Y" : "", "N" : "" }
+                },
+                data: {
+                    key: {
+                        name: "name",
+                        //title:"title",
+                    },
+                    simpleData: {
+                        enable: true,
+                        idKey: "id",
+                        pIdKey: "parent",
+                        rootPId: ""
+                    },
+                }
+            };
+
+            $.ajax({
+                type: "GET",
+                url: "{% url 'system:rbac-role-role2menu_list' %}",
+                cache: false,
+                success: function (msg) {
+                    layer.close();
+                    var t = $("#left_tree");
+                    t = $.fn.zTree.init(t, left_tree_setting, msg.data);
+                    var treeObj = $.fn.zTree.getZTreeObj("left_tree");
+                    treeObj.expandAll(true);
+                    return;
+                }
+            });
+
+            $.ajax({
+                type: "GET",
+                url: "{% url 'system:rbac-role-role2menu_list' %}",
+                data: {"id":{{role.id}}},
+                cache: false,
+                success: function (msg) {
+                    layer.close();
+                    var t = $("#right_tree");
+                    t = $.fn.zTree.init(t, right_tree_setting, msg.data);
+                    var treeObj = $.fn.zTree.getZTreeObj("right_tree");
+                    treeObj.expandAll(true);
+                    return;
+                }
+            });
+
+            $("#btnSave").click(function () {
+                var treeObj = $.fn.zTree.getZTreeObj("left_tree");
+                var nodes = treeObj.getCheckedNodes(true);
+                $("#tree").val(JSON.stringify(nodes));
+                var data = $("#addTreeForm").serialize();
+                $.ajax({
+                    type: $("#addTreeForm").attr('method'),
+                    url: "{% url 'system:rbac-role-role2menu' %}",
+                    data: data,
+                    cache: false,
+                    beforeSend: function () {
+                        this.layerIndex = layer.load(1, {
+                            shade: [0.1, '#fff']
+                        });
+                    },
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('操作成功', {icon: 1}, function (index) {
+                                parent.layer.closeAll();
+                            });
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('操作失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            });
+        });
+
+
+    </script>
+{% endblock %}
\ No newline at end of file

From e2edef0af2bc74d6ed5f7fefd17fc836f9e4ead9 Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Fri, 16 Nov 2018 20:15:05 +0800
Subject: [PATCH 7/9] rbac config

---
 .idea/workspace.xml                           | 515 +++++++++---------
 apps/__pycache__/custom.cpython-36.pyc        | Bin 2340 -> 2340 bytes
 .../__pycache__/middleware.cpython-36.pyc     | Bin 0 -> 3537 bytes
 apps/system/__pycache__/models.cpython-36.pyc | Bin 3643 -> 3751 bytes
 apps/system/__pycache__/urls.cpython-36.pyc   | Bin 2294 -> 2294 bytes
 .../__pycache__/views_menu.cpython-36.pyc     | Bin 1052 -> 1382 bytes
 .../__pycache__/views_role.cpython-36.pyc     | Bin 4662 -> 4662 bytes
 apps/system/middleware.py                     | 100 ++++
 .../migrations/0002_auto_20181115_2124.py     |  22 +
 .../0002_auto_20181115_2124.cpython-36.pyc    | Bin 0 -> 704 bytes
 apps/system/models.py                         |   7 +-
 apps/system/views_menu.py                     |  10 +-
 db.sqlite3                                    | Bin 208896 -> 221184 bytes
 sandboxMP/__pycache__/settings.cpython-36.pyc | Bin 2517 -> 2689 bytes
 sandboxMP/settings.py                         |  12 +
 templates/base-left.html                      |  36 +-
 templates/head-footer.html                    |  10 +-
 templates/system/menu_form.html               |  11 +-
 templates/system/menu_update.html             |  11 +-
 templates/system/role.html                    |   6 +
 templates/system/structure/structure.html     |   7 +
 templates/system/users/user.html              |   8 +
 22 files changed, 477 insertions(+), 278 deletions(-)
 create mode 100644 apps/system/__pycache__/middleware.cpython-36.pyc
 create mode 100644 apps/system/middleware.py
 create mode 100644 apps/system/migrations/0002_auto_20181115_2124.py
 create mode 100644 apps/system/migrations/__pycache__/0002_auto_20181115_2124.cpython-36.pyc

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b33ee44..8e4c321 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,19 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/apps/system/urls.py" afterPath="$PROJECT_DIR$/apps/system/urls.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/apps/system/migrations/0002_auto_20181115_2124.py" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/apps/system/models.py" afterPath="$PROJECT_DIR$/apps/system/models.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$/sandboxMP/settings.py" afterPath="$PROJECT_DIR$/sandboxMP/settings.py" />
+      <change beforePath="$PROJECT_DIR$/templates/base-left.html" afterPath="$PROJECT_DIR$/templates/base-left.html" />
+      <change beforePath="$PROJECT_DIR$/templates/head-footer.html" afterPath="$PROJECT_DIR$/templates/head-footer.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/menu_form.html" afterPath="$PROJECT_DIR$/templates/system/menu_form.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/menu_update.html" afterPath="$PROJECT_DIR$/templates/system/menu_update.html" />
       <change beforePath="$PROJECT_DIR$/templates/system/role.html" afterPath="$PROJECT_DIR$/templates/system/role.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/structure/structure.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/users/user.html" afterPath="$PROJECT_DIR$/templates/system/users/user.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -19,69 +28,63 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
+      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="601">
-              <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
+            <state relative-caret-position="293">
+              <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
               <folding>
-                <element signature="e#0#28#0" expanded="true" />
+                <element signature="e#310#319#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="role_role2menu.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/role_role2menu.html">
+      <file leaf-file-name="head-footer.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2097">
-              <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
-              <folding>
-                <element signature="e#1424#1456#0#HTML" 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="221">
-              <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
-              <folding>
-                <element signature="e#73#84#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/models.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="404">
-              <caret line="32" column="84" lean-forward="false" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
+            <state relative-caret-position="306">
+              <caret line="18" column="85" lean-forward="false" selection-start-line="18" selection-start-column="85" selection-end-line="18" selection-end-column="85" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="views_role.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
+      <file leaf-file-name="base-left.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/base-left.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="414">
-              <caret line="92" column="32" lean-forward="true" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
-              <folding>
-                <element signature="e#78#89#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="187">
+              <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="role.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="role.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/system/role.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="217">
-              <caret line="229" column="25" lean-forward="false" selection-start-line="229" selection-start-column="13" selection-end-line="229" selection-end-column="25" />
+            <state relative-caret-position="540">
+              <caret line="71" column="19" lean-forward="false" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="structure.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="310">
+              <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="65" selection-end-column="9" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="user.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/system/users/user.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="96" selection-end-column="9" />
               <folding />
             </state>
           </provider>
@@ -92,8 +95,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Python Script" />
         <option value="HTML File" />
+        <option value="Python Script" />
       </list>
     </option>
   </component>
@@ -109,9 +112,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/base-left.html" />
-        <option value="$PROJECT_DIR$/templates/head-footer.html" />
-        <option value="$PROJECT_DIR$/apps/system/models.py" />
         <option value="$PROJECT_DIR$/apps/system/mixin.py" />
         <option value="$PROJECT_DIR$/templates/system/system.html" />
         <option value="$PROJECT_DIR$/sandboxMP/urls.py" />
@@ -121,31 +121,37 @@
         <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$/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" />
         <option value="$PROJECT_DIR$/templates/system/users/user_detail.html" />
         <option value="$PROJECT_DIR$/templates/base-static.html" />
         <option value="$PROJECT_DIR$/templates/system/users/passwd_change.html" />
-        <option value="$PROJECT_DIR$/templates/system/users/user.html" />
         <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$/templates/system/menu_form.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$/templates/system/menu_update.html" />
         <option value="$PROJECT_DIR$/templates/system/menu_list.html" />
         <option value="$PROJECT_DIR$/templates/system/role_create.html" />
-        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
         <option value="$PROJECT_DIR$/templates/system/role_update.html" />
         <option value="$PROJECT_DIR$/apps/custom.py" />
         <option value="$PROJECT_DIR$/templates/system/role_role2user.html" />
         <option value="$PROJECT_DIR$/apps/system/views_role.py" />
         <option value="$PROJECT_DIR$/templates/system/role_role2menu.html" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
+        <option value="$PROJECT_DIR$/apps/system/models.py" />
+        <option value="$PROJECT_DIR$/templates/system/menu_form.html" />
+        <option value="$PROJECT_DIR$/templates/system/menu_update.html" />
+        <option value="$PROJECT_DIR$/apps/system/milddleware.py" />
+        <option value="$PROJECT_DIR$/apps/milddleware.py" />
+        <option value="$PROJECT_DIR$/templates/head-footer.html" />
+        <option value="$PROJECT_DIR$/templates/base-left.html" />
+        <option value="$PROJECT_DIR$/templates/system/structure/structure.html" />
+        <option value="$PROJECT_DIR$/templates/system/users/user.html" />
         <option value="$PROJECT_DIR$/templates/system/role.html" />
+        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
+        <option value="$PROJECT_DIR$/apps/system/middleware.py" />
       </list>
     </option>
   </component>
@@ -193,7 +199,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -211,23 +216,18 @@
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="D:/PycharmProject/sandboxOA" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
@@ -239,6 +239,10 @@
     </option>
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\ProjectFile\sandboxMP\apps" />
+      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\ProjectFile\sandboxMP\templates\system" />
       <recent name="D:\ProjectFile\sandboxMP\templates" />
@@ -246,10 +250,6 @@
       <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
       <recent name="D:\ProjectFile\sandboxMP\apps\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">
     <option name="ruleStates">
@@ -315,43 +315,30 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-1448" y="-8" width="1456" height="876" 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.32882273" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.270636" sideWeight="0.49573562" 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.32882273" 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.32882273" sideWeight="0.5" order="7" 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.21380244" 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.20558739" 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="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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12948857" 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.2232747" sideWeight="0.49573562" 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="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.20095949" 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.27005732" 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="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.28281462" 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="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="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="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="manage.py@sandboxMP" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34912044" sideWeight="0.5" order="8" 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="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="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" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -362,75 +349,18 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="24" />
+      <default-breakpoints>
+        <breakpoint type="python-exception">
+          <properties notifyOnTerminate="true" exception="BaseException">
+            <option name="notifyOnTerminate" value="true" />
+          </properties>
+        </breakpoint>
+      </default-breakpoints>
+      <option name="time" value="38" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="36" column="13" lean-forward="true" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-        </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">
-          <caret line="9" column="58" lean-forward="true" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/system_index.html">
-      <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://$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" />
-        </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" />
-        </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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/braces/views/_ajax.py" />
-    <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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/structure/structure_user.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-15">
-          <caret line="29" column="95" lean-forward="true" selection-start-line="29" selection-start-column="95" selection-end-line="29" selection-end-column="95" />
-        </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="836">
-          <caret line="238" column="22" lean-forward="false" selection-start-line="238" selection-start-column="22" selection-end-line="238" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/plugins/datatables/dataTables.const-1.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -452,14 +382,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1598">
-          <caret line="94" column="22" lean-forward="true" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/base-static.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -544,14 +466,6 @@
         </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">
-          <caret line="67" column="35" lean-forward="true" selection-start-line="67" selection-start-column="35" selection-end-line="67" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/users/login.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -576,14 +490,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://$PROJECT_DIR$/apps/system/views_user.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-815">
@@ -601,22 +507,6 @@
         </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://$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">
@@ -649,14 +539,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="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$/templates/system/role_update.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="657">
@@ -702,24 +584,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="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="false" />
-          </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="223">
-          <caret line="75" column="26" lean-forward="false" selection-start-line="75" selection-start-column="26" selection-end-line="75" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role_role2user.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="563">
@@ -728,58 +592,199 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/urls.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="601">
-          <caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#28#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/custom.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
-          <folding>
-            <element signature="e#73#84#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role_role2menu.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2097">
           <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
           <folding>
-            <element signature="e#1424#1456#0#HTML" expanded="true" />
+            <element signature="e#1424#1456#0#HTML" expanded="false" />
           </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="404">
-          <caret line="32" column="84" lean-forward="false" selection-start-line="32" selection-start-column="84" selection-end-line="32" selection-end-column="84" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="414">
           <caret line="92" column="32" lean-forward="true" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
           <folding>
-            <element signature="e#78#89#0" expanded="true" />
+            <element signature="e#78#89#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="493">
+          <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#41#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="672">
+          <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
+          <folding>
+            <element signature="e#73#84#0" expanded="false" />
+          </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="153">
+          <caret line="48" column="11" lean-forward="false" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
+          <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="510">
+          <caret line="30" column="92" lean-forward="true" selection-start-line="30" selection-start-column="92" selection-end-line="30" selection-end-column="92" />
+          <folding>
+            <element signature="e#0#28#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/core/servers/basehttp.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="401">
+          <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/wsgi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="49" lean-forward="true" selection-start-line="11" selection-start-column="49" selection-end-line="11" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/milddleware.py" />
+    <entry file="file://$PROJECT_DIR$/apps/system/mixin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="35" lean-forward="true" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/utils/module_loading.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/importlib/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="125" column="0" lean-forward="false" selection-start-line="125" selection-start-column="0" selection-end-line="125" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/core/handlers/exception.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/utils/deprecation.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="497">
+          <caret line="89" column="0" lean-forward="false" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
+          <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="310">
+          <caret line="51" column="26" lean-forward="false" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
+          <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="204">
+          <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="66" selection-end-column="13" />
+          <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="17">
+          <caret line="28" column="16" lean-forward="false" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" />
+          <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="330">
+          <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="96" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="229" column="25" lean-forward="false" selection-start-line="229" selection-start-column="13" selection-end-line="229" selection-end-column="25" />
+        <state relative-caret-position="540">
+          <caret line="71" column="19" lean-forward="false" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
+          <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="310">
+          <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="65" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/middleware.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="536">
+          <caret line="96" column="45" lean-forward="true" selection-start-line="96" selection-start-column="45" selection-end-line="96" selection-end-column="45" />
+          <folding>
+            <element signature="e#0#9#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
+          <folding>
+            <element signature="e#310#319#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="18" column="85" lean-forward="false" selection-start-line="18" selection-start-column="85" selection-end-line="18" selection-end-column="85" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
           <folding />
         </state>
       </provider>
diff --git a/apps/__pycache__/custom.cpython-36.pyc b/apps/__pycache__/custom.cpython-36.pyc
index 197c1ca6318ab6747b2da084b8e13034894663ae..e0346fbc7a6857511b473eb0428cdff8a55ce85e 100644
GIT binary patch
delta 16
XcmZ1?v_y#An3tDpV$j=-?6RByCaeT`

delta 16
XcmZ1?v_y#An3tE!^x5l;?6RByCzb@S

diff --git a/apps/system/__pycache__/middleware.cpython-36.pyc b/apps/system/__pycache__/middleware.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..33eb240e895aada0b528438998d4edc1aa154557
GIT binary patch
literal 3537
zcmcInO>Y}T7@nD3uh({(rfDQvXrllHYCcTW4?qxAg_eS<#){gaRwmW5+1VuPu0Jxf
zhBR8AQi*cp&L4m?zh*8RIB`LoD-JyGIJRTgg%fMdyR-8>&-1>|j4vHKR{rgmKfnIu
zIAg!FBae&xH6*<bBbnqWYtUPyyd@ffQ{G9PmfLV`-c1WFui<g_1(OBoJz>&|#evf(
z;=3q)eEas>m;5fPmj1w~tX}2j_*x=m8h;n6crDpW+9>jMoMlOSTO;qOxGiH9QS;&B
zAae~#UxkTTgG<&Bl1uS~H5@rFU0Ha-8?N+Z5hVrb%M#w6EXxYsML8#r;q6NY3psA)
z*Wz~XdM8ceC`&r+NMKNU=*^L?BWVvN=S_wloL24jbgZhvxH?X^Oi{(Vy;x^IGgU&v
zXBTgLys@r2O^kRmN#hM2w&iALZ*6@e>~{5reyp>&wb2@Fyw-he{OvdkXw)*zXBWZu
zUz%K7ZP=zB5eD=SO~;VzD(@ka3&|e&YB6U`toVTU#pCn2X!52-NIHa$^bWkHbHMt}
zfSTO7!45!+%QE*-S=Bi<PNd#t53H@0>gISiR;@&9K%|2pk><oiK|5^4W?`bJr_!lL
zNz`di6-6Bxo0Aj$x^RVd77_OJ5EQh_yGZ&B%r?u}!=*mY!TV`A=A)8wbN-{)b-|8M
zb7)exJb)ijyI|ZF2(|?SLjXT3ucnF4qE4%O^)wAkvv_R($_&7%d$6TCtw43sxVD;h
zqA=B0kr|FqEvO3mn*ue^#``u*;SR=^Xppp{%*=n9Wh&Y1W%1`qbyU?=MYLBw8FDRC
zph@)9BF!T4JvlvbtzU*=+~;L3xQ8_SmBl=t=liez=O#u@PQcREt^1ruX6!cBkxJ^^
zAh2>lF4A{$1PwVx)v3>BXbFQ@hUSJ09Wuk!JgN?fQHzv6IV>0xqp1H1(!Vh>c9#H7
zHj@#q2&AJxn=-Lu;nYVxj)n+`%9-d-PIZ<RMyxSl@4pD^$vz{jiD>dYi?u{%oAt#A
zZy<}nEvawzZcsQrT<yELEBR>#E39>_b*(K}>%skt+fde@{C<IgJTDw@&UVk-hYTF@
zRI1yEP~<oR2B7pzEs!|@bF=CjfpB(h1UnS8u8mXIhNd@&M&s!$%zE%?-P^PnBGL$9
z<3Z9O(N%Bk(q`!h0@i&kysuDmH-YrcBHo-NXP@f$I=a}HXWX@jmxTw9AN~aQ;qm*g
z&G7fBfkq^dIuwu`8kzK+NJyZBr0zeE`$JdY=mb8|@%P?(?t+dl0dRrn=zF=RZe^nB
z<la+uAk-}>P~)sJSde4YcN1hlXF&%J%Dj*}r~_H6Z1>IkG-GkEZb`n`_fhAg7ka8+
z$N7E<`4VO;=Ve(u&6+d@+F5$@yg2!NpMB4^xIO3myhwqn{<0-yoP38R5-!uPw6Uvx
zB^P;RYv>@Ax>^Ak_tZI9MTjesUbRf-4VdTRoWfSGz}PrHHH`D8?2$)GOel@in3~y9
zo(p`OqLssQlR|Jx0&b(<Py#-f!Ee^-1}gqG4pZxmvozp;Teo_fHbp1BJ*=%{t&P`P
z^-QT7W;;RB-h$Sn!Uz>Z;=?T3F<#QfA)l!?QC^)p5;Q(-iK3<PT=>W&%G6slpH<8i
z<QgR#STf8)!xQ6l6WOQ?V$}{p*pAQ{V9y8ZCJ7n@+Z2XZP@!uu6l^Ynj3llse7=D9
z9DWOef{=1PUlNOak)J}z%<!8UdK7+i)==nON7C=Y4E0Z)ALceh&I1HtK-!3~JfJ+>
zc5wA7s7vUj-Y0XB3`w%0YXJmle5hJ-MhxNdqB>EmHC)DC)b60Yz0;A7FY^86DG!@!
zPItbN@q>UgG6+mL2wEN4!)X$jxggl>h3TNiUIVNy4%S8F4;Flxa^qEvmZnII=tR+^
zOuq1)@`CUAi~d<#6QOYQ5O~*+G@X&p-FxXa>zesHn_)D*QjdVAY3Q)Gz|)mJ!|hOV
z=+|v1A8v`TqVMc2XHJv!ZmI8Pg{GIgxj>s`f`50Jj+NX&lz&FwSrH?kc61@IH0;lH
z!|nL;h0C>_td-($Dei<i#PvtLgIR48MIK=MyPw|tJoxI)ZAE^d-XlXR#ARyCBSl(c
z{)m{9QmjzZF_z@eitue9X}VYtt8_*TT-E2U*k7K+r8dQI9XAE?fAs;G56Qfcv5!#u
z0LjXeFBE-OOLiCLlx&9W?M|(iC8@5-xU1qQq`wu4$TOA0YTSdj1}H2Xmgt?1%A#JT
hEe4i*JMfWxj(o=Ws{{ADN<yt^|GuET&N&O~{{ZQ%B(nej

literal 0
HcmV?d00001

diff --git a/apps/system/__pycache__/models.cpython-36.pyc b/apps/system/__pycache__/models.cpython-36.pyc
index efe19f91401479f3171bd4e3a5b68fb3e8e2e702..f2110477ed8f3b88c451b9c58eda0c47468f9237 100644
GIT binary patch
delta 921
zcmZ8fJxmlq6rP#gyX^h!a{qsL<PL;*Vop&6yad!}fT-ADfv3&MY$9-QWOgY?Yz(v)
z#Al2)Rwl$)84Q|eVP|4#V&Qh05GxZ~3lrbFBZBP9eEZFtnK$o!^WGiV$_LJvW^lpz
zdF#t&V23~3{ID=$>+`16&^lzKsZ}i*m9ceJ?U-OPE)(laCe}nXVn=0Crq<aSuf}A0
znw2sz%|B;X{EV?5?;r1OyeVlah!YheFyLzV7+eukJOWQd8D58q@J%E`o_}d&@s6#o
zm;CTsj6piwHRI`1wp)wiF^8fVTt`z`q_YBnKKfJeOE{c9gw=%0Ts|-6wR>FhCYPeg
zrx|bAO|~Rvm}Ib_4f7m))cT_tI%gm-A$WrOIsDNIW?UuEqml$EIIdqC$RYKD<Ml?(
z9iOx7Qc+eaMnL&^q1k%PaTaa&ZbPa9dY~9i!b?4np-6_N^9WDzSj!^9&@3N((sy_#
z-1kl74qS$tRgr)SQ{C|0cQIW;TENlDvmGkJRcX88f680o_Y$QOREkO?(EV{r?KBQY
zM<DrB7UiGhLvY(D4xU7(I)(5;r~%@%wItLq@e$(IK^@3jgjYto&`q=h!PDK<Wn1;o
z{3t;$K^B(He7=m7GIuNl%39|ZmY))quFBip0nT%SxZ<%^r|fRQ?t><F3O%$Mg3(~j
zf3{7Z2N#n=L|aSyom7Ut(AWGS?f%uT=w(TSB#AJI<G&ti$uI?v!ae6kDfSow%5a|e
z1q75~ocILs^kEtH9_Ls1#)<vfNkUIwZa8k$a8^*3xrS2x=&brwqi#EGU3?YvRN$f6
c%Pa8Kyljz1io{a1f*B{E%gXpVV}V%oFHgCrEC2ui

delta 877
zcmZuv&ubG=5Z?E8H|!?e&F{^&HBD-3Nl1;<Sb|myVx=BzLF#EMNXQ1-+M4=yb0`QN
znu7?j)<Hz{UZmnh=*5c%uU@<v1o03ocoF{qaV9CY6nB|#zkM_FX5RN^C;k3}UNVf}
z#>=0JrEPtWJ>LFsC+CLUNK<l*S;>vMv8Lq4Ho0Tg!fxD6G^I`EMBL<pl((SDKEn+z
zSQtL?BB<J+t<Tl&Hi~mKztRXulC;0|s?&NlpI4zIPeVmdz?K}Cj-kg>5HzMRkwQ}C
z2=vgGJXg@X1cER5Y=y7L_nFID%;hZxKjbpAA)^#R7DaVaIV>t!BP!y!A}CKJ;h}Op
zZ4;$>-7@V^b+zJoYc+qV?usG!ZrB;BrlNTirO675FpI_L<(h0NFs1IXe)z4<4jkE=
zHp~!Eagl|Ez~$5!(m^y&L+EW3VPfpvZr}w=9?PW=VNv}!9se|?9SQ>TJO|(UvTOoA
zX~Pf3DVRcDb5SII1|iSIIpUMV&7<e0RqD;@^EcLOx2sF_<!a44=#-pcgtkIXF--p_
z2}TI0m!4V?Vm*LghMq3q|0tSgBGBO!W}-$GHx*HU-9SIQ(f0=?(Ak!{H{aQT&XZPN
z7BmK;1aE_tz}X&6hSriLqFq;zScsqi&qH7A|0;!UxF-);-4466LAf+OG(i9Ky7tr<
zIe&rnnnFOiE)u_lfO5?cze+rHT&{y#yk*=RKU9RIZY%3`&v!JhfnqJ!g~;Keql)?}
oDw=|?Mp`Z7$|U?TPO&nKnlm9913_|$GTv_r9+|dk#q?P8FZk%8n*aa+

diff --git a/apps/system/__pycache__/urls.cpython-36.pyc b/apps/system/__pycache__/urls.cpython-36.pyc
index 917b65a117791c880959f2cf94e4aeeb5d6b50c6..f15392e67f26174c18e3abccb95569057b047503 100644
GIT binary patch
delta 16
Xcmew+_)U=An3tEUKl$xO_V*kBGA9N5

delta 16
Xcmew+_)U=An3tEU&+^Si_V*kBF&_ob

diff --git a/apps/system/__pycache__/views_menu.cpython-36.pyc b/apps/system/__pycache__/views_menu.cpython-36.pyc
index f497cd3b96f6b1b77eec78da03d61d6236d777cb..b481154f8944789338f128d4533cf92ccee23516 100644
GIT binary patch
literal 1382
zcmbW1OK%e~5XbF(C)t$r!5fJS2lkQ!+)#xof#A|s6%`zoNY)ZN(T07b_AX5kw^Ztl
z@4=VggZRp+2fhF&X1qz$hq$nkC*H9${?E+M`@Gw2|CGN!ZrX(WB9|T)<~uOd1Pmvf
zW+bOErG#7D&aB*yZI~18WKQnJZtlgNS#vW#58{B5w}gA#KPB83?%a-B@E-6Mytjlc
z=-i3h;A!&?csjy^9UUGXlBjzQ=aGo&U^i9Ohg2M&)5fu}TaMG>oj9sfDfnJGON+?T
z>xW6fKb5mrQY4kY{THtHQ@(IPIA>23^$=q(AIR7|>IwV^5>rlMOW3i)Y3!bn5yebT
zgV;MG4vBrx=IAwya_K0au_VhF8=^*hEEpKL14BImQ;`XsSab4?a=J|_drl_K2;RO^
z2x#r=Acu$;Byyz>`?X(wnuuYgv<*(}s(LD<?u|vohGkKSS;Zi$1TuG&$VS@xe4NO!
zf(%<ABTJNG><9Vt?DdPmfh;l7n=}&x)l_NkV316wYM@S3CGx=+D3@ZWpg%p4YjAvs
zx*aftuF<cLucq6-p(4-$V?~k+#&nypyySI;^N_KlI?0-qCNCEjMW($`Dl)FjVY<7J
zJQP?&xdF!-6H&R2^G!4X7#zyO33aGr8Q+y=V*Ph;(-xTP&Eyu;+SVavv!qJ4VdH+}
zN&JJnjphy-?18)sMsF_b-896cxsuq-jKBx58|9k1p+JeAEAlQ_dkQNz<soCho6Q~I
z%{ROSAlYqrTX8H~@OSOA+K~O<(3#v9yh$WgV%udG4MGrE@)pi}IA65F^v0x%J08Ng
zhRI6hO-x$<tg^fZk@Ob8IL+X)HY}-nG)iYiio6f&tEw;67$JDQuxH8;f?yyT=-rRP
zc#BVxVqEqO;~=RJG9601pW4mw;~^3AxP$khKde<%<`O@85;4=Bp;a|FV0_b46MUs+
Z#efdB8}?r!hziRYS|RPx(C)Q1+`olBG93T_

delta 468
zcmZ{gy-ve05Xa*<B&nOwk`|N!7Pc_3AR&ed<pEIH7+{D(;!2J3ft*C@#=yeD0NxNU
zzzgssh`|ql!~?K%7fQtdw*1rC_u>2BJA1O(f$Or<+mDM#zh|E$d?3EZO-?f_vv0Ii
zza!_pl*&D_GYE*X3tqNSoafVk$xuJqS4KKd8f8_N8Bdy8QSd33FB%a?NmVvrJ!@jD
zX&vMnIULz=!Bd-P5CgV+(ND5I1~~{9VIkH5YP2jAeSZ>_aluz5m&G?RdJBLVwE@7&
z-Ae+O)uLd9GN;=fw?L$w^*|&Akt{XjBi+3Yh+q&i4f^80hQt5@)VSfrRUS9I>nEz)
z*=)WLLvV==gohX*e$@YN)dvSU>uws|5TIROlds0v1a*M@cdD`{MU}QWKPH%u19NnT
L42eUBrnmM5JZV|6

diff --git a/apps/system/__pycache__/views_role.cpython-36.pyc b/apps/system/__pycache__/views_role.cpython-36.pyc
index f66068b4f477b06a6d5aa6c4aea802fbace668db..24020772453f2a4768feb07c100b22b094c37f3d 100644
GIT binary patch
delta 16
Xcmdm{vQ35En3tEUFY)b0c6}iLD>4M=

delta 16
Xcmdm{vQ35En3tDJ*YeFqc6}iLCzb?W

diff --git a/apps/system/middleware.py b/apps/system/middleware.py
new file mode 100644
index 0000000..7e3ec37
--- /dev/null
+++ b/apps/system/middleware.py
@@ -0,0 +1,100 @@
+import re
+
+from django.utils.deprecation import MiddlewareMixin
+from django.conf import settings
+from django.shortcuts import render
+
+
+class MenuCollection(MiddlewareMixin):
+
+    def get_user(self, request):
+        return request.user
+
+    def get_menu_from_role(self, request, user=None):
+        if user is None:
+            user = self.get_user(request)
+        try:
+            menus = user.roles.values(
+                'permissions__id',
+                'permissions__name',
+                'permissions__url',
+                'permissions__icon',
+                'permissions__code',
+                'permissions__parent'
+            ).distinct()
+            return [menu for menu in menus if menu['permissions__id'] is not None]
+        except AttributeError:
+            return None
+
+    def get_permission_url(self, request):
+        role_menus = self.get_menu_from_role(request)
+        if role_menus is not None:
+            permission_url_list = [menu['permissions__url'] for menu in role_menus]
+            return permission_url_list
+
+    def get_permission_menu(self, request):
+        permission_menu_list = []
+        role_menus = self.get_menu_from_role(request)
+        if role_menus is not None:
+            for item in role_menus:
+                menu = {
+                    'id': item['permissions__id'],
+                    'name': item['permissions__name'],
+                    'url': item['permissions__url'],
+                    'icon': item['permissions__icon'],
+                    'code': item['permissions__code'],
+                    'parent': item['permissions__parent'],
+                    'status': False,
+                    'sub_menu': [],
+                }
+                permission_menu_list.append(menu)
+            return permission_menu_list
+
+    def get_top_reveal_menu(self, request):
+        top_menu = []
+        permission_menu_dict = {}
+        request_url = request.path_info
+        permission_menu_list = self.get_permission_menu(request)
+        if permission_menu_list is not None:
+            for menu in permission_menu_list:
+
+                url = menu['url']
+                if url and re.match(url, request_url):
+                    menu['status'] = True
+                if menu['parent'] is None:
+                    top_menu.insert(0, menu)
+                permission_menu_dict[menu['id']] = menu
+
+            menu_data = []
+            for i in permission_menu_dict:
+                if permission_menu_dict[i]['parent']:
+                    pid = permission_menu_dict[i]['parent']
+                    parent_menu = permission_menu_dict[pid]
+                    parent_menu['sub_menu'].append(permission_menu_dict[i])
+                else:
+                    menu_data.append(permission_menu_dict[i])
+            if [menu['sub_menu'] for menu in menu_data if menu['url'] in request_url]:
+                reveal_menu = [menu['sub_menu'] for menu in menu_data if menu['url'] in request_url][0]
+            else:
+                reveal_menu = None
+            return top_menu, reveal_menu
+
+    def process_request(self, request):
+        if self.get_top_reveal_menu(request):
+            request.top_menu, request.reveal_menu = self.get_top_reveal_menu(request)
+            request.permission_url_list = self.get_permission_url(request)
+
+
+class RbacMiddleware(MiddlewareMixin):
+
+    def process_request(self, request):
+        if hasattr(request, 'permission_url_list'):
+            request_url = request.path_info
+            permission_url = request.permission_url_list
+            for url in settings.SAFE_URL:
+                if re.match(url, request_url):
+                    return None
+            if request_url in permission_url:
+                return None
+            else:
+                return render(request, 'page404.html')
\ No newline at end of file
diff --git a/apps/system/migrations/0002_auto_20181115_2124.py b/apps/system/migrations/0002_auto_20181115_2124.py
new file mode 100644
index 0000000..acec7fa
--- /dev/null
+++ b/apps/system/migrations/0002_auto_20181115_2124.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.1.2 on 2018-11-15 21:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='menu',
+            options={'ordering': ['number'], 'verbose_name': '菜单', 'verbose_name_plural': '菜单'},
+        ),
+        migrations.AddField(
+            model_name='menu',
+            name='number',
+            field=models.FloatField(blank=True, null=True, verbose_name='编号'),
+        ),
+    ]
diff --git a/apps/system/migrations/__pycache__/0002_auto_20181115_2124.cpython-36.pyc b/apps/system/migrations/__pycache__/0002_auto_20181115_2124.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2f6d4f70c9de4f9159b568d6156e31442825d8be
GIT binary patch
literal 704
zcmYjP&5G1O5bks*nIz80h&R0pxh#`WL1d9#kP(Dg7xa`3G?}S3WbFKGcOvdtufv}7
zv@hTjc=1X4DvNsX1w2`uaoO#ri~37_^;PBJWD=d~KPM-YkRRm6aZx|OryrmI0*)k=
zlR6bmsY6~6puj#6V8Yq3k1S>2z9zBv8*@oaO;nYI%Db|uwehP4gw$&rx;h~$2l(^?
zg&?T|B&9GZoRkT7;{lc{9Pse^7Ys&QieBG(#b^_Ny&*(f2Di4XplJwW1ix*<<rS*&
z^_lKOWyZ7FEa7Ecc4aP&TZy_ie%)6qp?V*&f1O`kZa>G&1dRfr%DOP)_d=~2EqI+*
z!rZ-S@mBUKmq^eZf}^G#IKCNb{rvvr^86dt@>Vjh-(gNKrHT**ebF$5p{5$6%Xn`~
zA>k;d%0pAxX5z>Md`RKkM4aO%y%eaAIX~@lX)&z@q7^lWdR+>waBsxiIh37HOFQUS
zyOvCF2(YjairI{4A)CA#942a7@qasCiMnUut@!)$`P1xJH5;+UL@6?z*RX0nERVCi
zZFROAX?DHZ42L`CdEYgBK1-e?N%EM_llh~)_DtE|$8yqB6an*H*P+goT1lNDdK9}R
jgiT%-%^s`<9z&}`@Vcv=b|0&lV1GA}XO@w+#HZ{Z%kaZZ

literal 0
HcmV?d00001

diff --git a/apps/system/models.py b/apps/system/models.py
index 74d1d67..63e7e06 100644
--- a/apps/system/models.py
+++ b/apps/system/models.py
@@ -11,6 +11,7 @@ class Menu(models.Model):
     icon = models.CharField(max_length=50, null=True, blank=True, verbose_name="图标")
     code = models.CharField(max_length=50, null=True, blank=True, verbose_name="编码")
     url = models.CharField(max_length=128, unique=True, null=True, blank=True)
+    number = models.FloatField(null=True, blank=True, verbose_name="编号")
 
     def __str__(self):
         return self.name
@@ -18,10 +19,14 @@ class Menu(models.Model):
     class Meta:
         verbose_name = '菜单'
         verbose_name_plural = verbose_name
+        ordering = ['number']
 
     @classmethod
     def get_menu_by_request_url(cls, url):
-        return dict(menu=Menu.objects.get(url=url))
+        try:
+            return dict(menu=Menu.objects.get(url=url))
+        except:
+            pass
 
 
 class Role(models.Model):
diff --git a/apps/system/views_menu.py b/apps/system/views_menu.py
index bd8b623..037e276 100644
--- a/apps/system/views_menu.py
+++ b/apps/system/views_menu.py
@@ -8,7 +8,10 @@ from .models import Menu
 class MenuCreateView(SandboxCreateView):
     model = Menu
     fields = '__all__'
-    extra_context = dict(menu_all=Menu.objects.all())
+
+    def get_context_data(self, **kwargs):
+        kwargs['menu_all'] = Menu.objects.all()
+        return super().get_context_data(**kwargs)
 
 
 class MenuListView(LoginRequiredMixin, ListView):
@@ -20,4 +23,7 @@ class MenuUpdateView(SandboxUpdateView):
     model = Menu
     fields = '__all__'
     template_name_suffix = '_update'
-    extra_context = dict(menu_all=Menu.objects.all())
+
+    def get_context_data(self, **kwargs):
+        kwargs['menu_all'] = Menu.objects.all()
+        return super().get_context_data(**kwargs)
diff --git a/db.sqlite3 b/db.sqlite3
index 3c1ad8285df967f99424da6f34c0a6c9c9a38807..a38cd4760f9e23c2941489499d395474be1e1a78 100644
GIT binary patch
delta 8716
zcmcIp3v?7kx~}e??s;}s67nD~l7LZmB{S3W$^?WkBv}Yy5+UKatYJb1l9<=#ArJ4~
zrd1T53k*8GKyf{y?p;8lM8zkl2(F%0*S*(!Q1B5FgtL-mee6}Q_pj<nGBcUD_ndof
zp#HDA|LVW~s`{(Gzk9Zvv21xo+@6)fK7kPOK$!%EgK~by3<t|T@zk0}F_&yU7}6&d
zu;zn(a?;J_Iaej~D07ytdsBB$u+46_JL&_yJstH9yX=)^*<J6D9WHWFB+EszJKrJC
zbhu{94y&Ws>-Bg;f6XpPjaAs~Zn?NPG%cq%Mj=~0B_4;{6Kc<~#VK6wVrPjf^i<B2
z`O&6it3xhvJDsuxJS-gZP_A!oZ|-Rhw2pVnZY^<o?M`<nJ=Y!6iQVdP7JD3Ws6N*f
zr*OI)ZkIQ-FSjI4;cz)Uc6aFSxv~D*t+E|P?hF-Au}42)FR_+*ONt$y(DhTSaSE@?
z>$Q7BFHVu;6dv%`>kYAao;Zcu>nd?NLyPiq;}lNlx<n5BX515Yugh8N2p!KWv`5XN
z-D~x_U`0G4o`H<g4=mn;|Add=Yw&q|9nO}1z;m(KSCIdS#OIi~S!{UmZ<vf3=sY%Y
z(-<u%>bp8xgDk!Ur5YnQdb@);7H&2}MVNVjo$TY%1x_A$0Q6m*T^;M1$#cdrLv6wK
z-W>c4%7`*F(lE5gmd+&iJ!7lsyebE;M)-UD4fr~Y-v>_z@M-)Zej6XhuY&K--~;#x
z{5yOvz8UYtci=5}Gw#9dxCuAl)qMr_9IWsh!=&X<nN4LDm6=pdrZR)dbRv_}h)hYP
zauU6hqT`HAGN~GpsKiuCREktus5Db)qS8ntYv8%d8HUr73r?Vtr&34N9I?!D95R~v
zm^DA<9qQC2{Z4l#>6bI4oe2K}Mtlx`0;7EwpMcRmho6G6?#1`v9r#wP;!XJ1xETlV
zO1v0XVjnKSGX5DZz?nD+>!tsezLG9TpGp5Iy(_&by(}G;{vbUnJs|ZbCvi?mG3dZO
zHVK{ADj0pCRU~vytB7bwt60#WRxzWqTE&D0w2BdZu2l@^Gp(XWpK28WeWF!(bVjS_
z&}ps0p^ps;?Vd#+>2-{eWzi|U4rU?;y+tt_ourtBPEgE5Z&I9$j#JD)Z%|A}uTxAz
zuTe}z$0$xhM=7SDS1Bf=S12Z-mnmYTyhJM!dXb`tUZ7|}M<|-n^At_!If_Q~EJXwA
zr>IAVDGKNriadInq7L;@<j^6CEP6`N8I3GDD8ku`l8B&xeR$1q-j1vFA`6!(P?DjT
z`;ymOz&p3-3@la=eg&&=qXR2ttPT}+&n9yH;I7BdZtEZ1zjtu^%>!He&pvo-%$=Qg
z3?8{@@W?G^_Z&XE=O(S$+1)puyKnm(1|Dx7>^m}e<RR_8Rv*~5dtl$~L;H3P-FgU~
zEgHCE>%jKkYr3<yZh;O`Gy^8^kj1AF?7xfP*ZWvW;tHAQ-dW5Q8l!t4gZ}>uWo9In
z1@&4Tf^bd})D~L7g4#?glAt!xiYTb-X~iO_>uAL+s6kpW32Gy)7zK4Ltr!HgfmZZ_
z8lV+HP}k53FR1mjq7&3>XoV9L^;fjU^6F}+7y+wv$jIdI>Oz9qyjn>xi&qyA%;eSi
z1Sj+AF9>GvY6Zb`UM(k>#;aunQ+ahB!AZR8BbdUga|tH%YAL}aUY$cw!Mr+~R3u)#
zilE4=vj|#vbtXYGua*!r@v4`gkynce8hF)1P|vGwf&#C)2=ct@B&g$62SJWkWrD0u
zwF4SOz8@vC9SHB2-jf8eV3y@^OSgHd$!)yFa8mz>@JFGLH|XBwZecsLe<3;PfKZw#
zWYiXg?qc#5k;A{fzN59VUXIYn=$#b4pQ*_xDq?P`>IpQo2IKYd*U4e~W+pA1A7pgl
z;T`PEke|V!k96kHQua{4Ex;_`bP$B?p*xs@&<xHXlxB^1ku%z7y(8Z0r2fKn%qgQD
zUynq#6opNlOjiHYPUbGgq*@B}8I?thY71{w7^^_XVGgUE;Kd1rnU3j=srl2Vb_TkF
z?LGZ7yBMEHoY)#x6lQCmZq4_3k8~#O?9{EEAq^q?U-<9%uXqT5icjIc03n~mui=;Q
zv-lAHH~biW7~hX~;k)oQd;|U$py^KBf*XOdSHPja5SQVrup3+P6*wP`{S<7*I_U@L
zYw1gA2#9=}qzD|G^60z<UubYngCPwDH8`umfCisy@R<gmYVe5$XEZpi!N(eWq`@hk
zgTwAEDo=t`SagD3yh-J8D&L^;bt+$@@)(szseF~nSEziM%9p5ok;)gSJVNF3R6a-L
zvsCs|d6>#)h*Z$i^rDZ-LsULR<w0_s&5+(9^IwcFVLQG6<T-$+;*W7Q{&$=TD<J~y
z3izn>BR(R1i=UQ;@gJlw@MF?v_#x>OzE}DH?~vZXx8WOMWqKj$SdZ5L885+AxE#+0
z^9c1_p5Lr30x&I^BH&p9z_J8@V+jDm5&(WB0PIQtxRn4fD*@nD0>G*SfKv$oqY?l<
zB>-efM|O%_0Fx2`A{97=VSz}=CGaQ#piu(Aq6C0M2>^!@0171l3`zh9lmPH20iaI;
z7`;RQxRU@-Cjnqi0zjMufHw&MZ34Jq5dGv5Sd##dCIR3~0zjDrfH4UGVMdmRBt$mg
zLKBD2lSR6O&jagxgbM`N(Ij`_;ZbrX0k6T41e485a}b^?&4I{wNU3T7hNS+?XUG;s
zgVC2+kT%U3?wG=6DjS!tbS|i>*j&-%YPqa=sV~@8yI@64<<iP4?cHU8hK{a{i<}kL
zuG_rHbKR1%B~`L-V~ySIU+SAZ`jX+vmrG_koip7ItEbrIayd3P1>4uR_C_}-o+-O$
zI_y?>q45@%oV#(y;LhzbycHBJknKedxh>Edl)WCe>~cEnc5lSM-0nboV?)PA>)MXC
z=C;84psg{uF3{WBV{PeNul|yuBQj=)qS5Hf3tu~h%~je;=C#!}RV}V<s&HRc>AiNz
zhU&5nwq>;&)|I&CuWJ1DBD=e4<NThDw(8~n>nein9#`dx1=S1f@uP9gbULgh4tOmq
z4m7qkw~vlx<VDZru)-^$-BTP%K6czo#$cA=Ei3XD{*OHN3X7H}z?ywSSL`&NX6CY)
z$N*Ubmtmy#Niz;#K=?a2|1QANevGF=GDudIgPe(=4pJwh)^1pP2^fZUpW)n?<awmY
zMbhMJnwxxzX`;?@v>_zeM&sd5_B+heT$@%Iw*PyDH6&f0%vzD@gek|^tN&7Xfj_SM
zKuQ+ZS>88)V7W^-hwU@pqtmliV6f-IpKoXVj6Hl{H|q~8JJ?#r7ETVaD}=z>9+mw?
z_+J&~2Gb3T%k&x3rZG1)hu&qf8P_O19Y}8PZEFa2P0jBL23qs0mo8cq+Rv_HDnfI)
z>0&ekdBSscv2&TCu(FFi##jlp6ogOT!zPD~ceCmJx8KbU^E&g}C@Z|>0XCg=mxBeD
z(QSDP8OWIv{@?-jO2!dp9%N52&hT3gvJ1j<_ppZW;oa=yuyZ$ieR$GtHb4B%Znle&
z`+a-ZV+9I>KSl803C}yA*rC`W#R@1#-5Y81bGSDh$`w#Zn>;AlP_m$mJWuYA)JgJd
zhC*x++eDWEWik|b#OR2UJVY9k)fb>hP%IH7d)?CCbdj;*yj;#_9Ent?oo-7AWTzFj
zmP?kkx2i`v^Whv380jdIj>6&athD-uSq$&LiT8PWWKZvA&nCH~V^c#@qjPQB+O?gH
z?)5F+b&Z?5nwnSEHMRO%d`^Gedb@vlg}kbK{YHPCZ^O!##uoqlWzGKbWlc5Z74}ti
z)vbQVN_X}0r5nO$MDDI@7PeN`Eq2!|U)Ahy^Sk|<eR55CW6R3rm9oFi?_RliRcp0l
zA=qBlT(f+!%U`#c*xp>(KDI9t3<n0z;8O^nf^F~~Zk)#XjsI)}qR@|W_#atFFP_A|
z5|&H<knWbQ5Vwi%idM^?Et@U*<~PhOrf*GMCYk@y_@QvjxYh85VW(lH{xA9_y$-$%
zz03!eO){WjG^<q44E^@OfjjTkj({&;xPM^V0|Q5%uU%PNSK%*OGS635<gch+T2!{A
z!dF*e)6yziS3_W}jbvN4wGjI~L0jpiHNIPmtB$8!qa$|9=Ig^h$4s?SI{e1IFLxg*
z;*9f<r40GXpuc^kX$Dk?ieyr!FDdlhC%VfeHH%{VB3~(>ldV&pU3`9Pazl;*fw78M
z1H}2QeM9Ol?G1+5Q%1%>3>FdLSXx`LBxV@YG!YK+Wdl0dd-9bVQ##UGvq>jaHRC$b
zCTw6^cxdnA@lI=fkQu9AR0;i0&=XBmTbsLkpgWiyX_+pqA?qi{q;)!RcZoYv9CVRN
zFWpD}?oV5mIlAgmGf!9j;dA#rI?jA~#iEM1Rj1R{7;FvFRli#mF8j!qwrp}@yUP8a
zzr6qKuII)XUV3$Td^l0Vy`7C(IPGZaI+*`@+Omwqh7*J-UE;VfRY;st!=rI}XU*wZ
zjjPg3Pa@y{DF#hXE=ec870((MAY-8s8-FAs#;;Q(3}E-XvF~EqveeN5$L`DV6G``F
zf{CO{u1%x@@kJ)`wFgs5Q${ykl;P-wA@*Y2i^R_A>0cfF?doJtG8njW8qyoJuLs(R
zu`ZCmE>J{vPEluTZ+Dcv(o0UK;)Fl(EmU2GY8LBbJ}p4dX+s(~aP#29YUIIrzS_#N
zBC<z|uJ+Z|F0WZqUSGDrS3Q69IOt3w`=qA!e`QVir{)?0-OX!lbmw;ly1O@YbT!tm
zZ3?tQqE`AhgM9h9jUO0RVX`KraCSw18-W1~KBmH*@vfIw*81j=6HK8W-fdBxG&XmW
zmtZiin;hzSp~bL5BF1O?#u*>jejuUoifYaFIMc!Qh-DxZ_%o~!4ax+jw?*yts40)#
z?$KUH_WSU6gRQrh-D6l`naJsA_L%2WMprX-V@8=C*_gxMyz^oDEms;=m?tnDvjL)<
zj@<!KmSGDh^e`DUZJNOJ(1FL!-nccvI#$&ADi@9Hi73;J!Ja^KtF3hS(&37|Cto%A
z3}kcJoUw~oyHcSnI_7KwQ>DY_39DUTAq^19P@R$ZSTZ}-5<Q`#_-4#vQS_k_<)L<}
z6b%#dm6jP=^&?~!{WX!8jbhC3T+C!F_LY~{N0X#xw7aLPcWqB^SI`z{Y^>Lqa`?UB
zC%zkO;~E6w^ZY9CIqFj-^_j#OHS13lTVqB?2xXWC0n0V;6PhIH2{l=sD5l0tjs_N?
z^Y(kWDvqoXo!KZaiKX=LqnMctxe6R})4w{#+Tr!KFt-p+x`BtDAKbfTX#Y!tFYeb)
zy7lX$!=!XrBUadMLLtgw3@8(2<{FXq$y94OvgRgy5#@*r;cKhZgljM(ZNhG8P<mVH
zlkS5L6kq4#ci?No)9`g@i?m#tCe4;o#Mi`y;%(x$;>Y5XVhbd?CQ-@b%3{){xHZg4
zppQ;ivJ>dF7|>c}Wpc&i?9<~SlWLUMyg}QPlM_Bf7Ahm5hD35Y`PLkr|E1BUQQQP0
z)6AzvX%w0((%2&QCs8X=52cVB(FB!D1{`;8M-xvHF&?Ma&UKtXGoa8@SxTg$vm_?e
z5LYb;G@2vk1RCu~GL6$HBts|jXN><=Z=eH>3hlVa&{JD+dg`-~P(ys?$7#Z^=P_4a
zP2zp9&&Xv)ejG4a{)TcahZy{&B*V);yvgAG_%_R*uoZr*I)t&*ErsxWsY<#iWmyi1
z--{>2--{jM8L?WNF6zZQA+)<JQ*yadW@NXFd&8I%K4@d6Dv}4K#k3*WT|QS4`yfsE
zh|qHSoI<W<q6TBBc=k`2p{Y<-E~mtKNIQxgUYX<kr`kwLJ2|m7a!O^S!w;<E#$`*(
z=4Qp*R<vxEp6==6EJkI1w$yPJsTO|vL=5?9YIGJyN#hC*zJEks@J4TT*<#Wn1@fXK
z5@-n;j-)nt3g=6tkK`xP1nS5viW8`{iBfEq3G|U^Hcz0AFt#a!b0+f5fO6m`?*xOQ
uGi@A=A0^lp$>zq0W|R>1)3~ZQ8)K~^!xMh0O(Yoj@xF}M316@=ss97^M6$O4

delta 4377
zcmc&%d2k!m8GmmNS!-E(%8e6Wa^jMdTH1RhhmgpzV;qo_IC31Bw2o}ax-7?sd}gQ*
z0<_a9#SyS2hf^psO*^e=FkqT+q|H#8&~_LYW|9U5hQu*W+YlO{GbA(ZTPcn&n9Q_)
zu<P%=^?t|uzW09L_pSO*82dlWdUW|ha1H<<V4Ax24Sk0vz`3Klo<XG9a5<S_wv1W|
z{%A;EUSV0x7IR7gCzY^{5=pX(c2;tT$(1?E90o7QiXbMNb8K@MEGyV$d-7;bUd2pP
zqE%5?%;U0XkX__#?`cm2<M;(v7io?pBK{_x<?O}WY!yk6IFU;(&6Q>?B3gM_;T?Rk
zE?1nx;3Q6v9LZngI_5A~&61q_EO)lQg4H3iILM@u$Ij9ataeet>nHc*S?4emk&_%s
z@|8Sp4ntBLvRz3M`SKiws7Q*aB=617ox|WI#jc3S`{!w}k}TS}<Qw@#?946Uu~)pz
z%0~1s$V5g04WqZvapXgPN3H0`=x+3FWE{1ypPJ|uMsh7wx84tz!OY|aTkb*wGLS1_
zdf)5Xb~gp7<o9gLtn^}rES`GZo@nc6NOZIXDf9x+G3_XGS|uKA?$9TPZA+nf^aY!z
zWw9Qe0q8pV7n(pHq4&`l^l$W!(FMCspfwZ;pk5m?v_Yp0G)+QCQraU)kqjhA5-^#g
zaMyqGpKGDaKc_x4FDB4cfWAam(dp?M8+;DAbrb`kUXSr>gBclkS`BqNJXx?^JS~S5
zg{MW3ObHU1G{rEGF`}1&-h`ce-*g7`phC0+=}p(sDU9_Krm8|B0~9SP0?hc~V-rvH
ze?0Q)#495lFKqK|^On1cOP$*)H)i6+5JCWmf?&|4o)O^jWuR~T!{Mu%$^Z)3SfTEc
zNp~jcB(Y)OSO?V5da`6EcFb6WU!>MqsK<K10)T{9!hbx+a~7z{XXk>6(c=@x4^NCd
zHSy>}X)kQ)<FaL9BYJcYpb>NgJ&g{c56~6#SM)sIoxSKbnnY02YonN<jl519Ia=-a
zkW1849`g3ph%91enok?t56~y*FxrnkLvN$sqF<qBu)#sJR6C{g`OPx-)=sjJ%pupQ
zN9)LJ^>Q7#Fw2Op00NyR@qwMgy04;A1SyceARWZ`&`){MjL)VBTzqn5vVZ@?V@EFj
zU<?O?FLOScmeTwo&_@6x=_<DK7qmW`RA5c8e*Bo3EP^w&sVp*|xv6PPDc-=%DRlG3
zMvkHgt)~D3HQcZa-emyRFi^uyAp<qstYEOS04!!8NoQ)31jXQq(TpyJHoV=Yw@o_Z
z+N>j4?S{fkiFsImI^${GpLIplI5k3bk$)nGhze+fuO&J2#-X$Mcq$({yM1hTJ-nMF
zq~*yC<mx0xmW{pvH^8x?M))3s&mNeF^#JWL{ml5Ou{7(KhI^PRx|6!^(}UED<aIJ*
ztgr<>0@Z)+Cw?-vz75`KBnJqK%IzZtpXi5_o<OeybRNBqBm5n@Gl!x<kp*6O?Wv0c
z&t7=xH{-885D2#T+Y&fk6XXh#2HX;G;n=Uo$A&LHd1U;-A5I>4X#Bv_9k}MEvu|Gu
zg%j@!fUco0(Anu5oBuspucfNCeTCZQ<!W1Zo3?R_v~4qK%uH=y(#Q9?X5@1WrJFZ4
zatx_g>Ih0sW$)@#@)o9YHz$?4OH-L^CbjZF%r}M&Or{MiyHPx}rGQx*zzR&u#}=63
z6|}G4@ZEg;Z{7{c#j_@4z_c7wHm2J!Y5XOamSI|oX)&fnm=<EvWHswrlqO7?zV?2B
z_B{6d3Brn!8_dyt{Ztl(&O==IF5zl*9=rGsT0<Ks02x|`0S6&X(HR<?C_rhjO5uqx
z-3O4xbRRB0J;uHPH?;%|tO0t9(Wuuuvn@+jI&1)fmikzrk*{kH`*}%T#qqd7va7ai
zZP=99(z3}N+Frk^aa(nl-P`T;x63=K#O@tU+ucIMvAJT0_m0Z)Qa%#$wN(apbT+kD
zi|fK2{^n3q1P|%v$`!M60mqeyePRi3w@P-NlcdSxdoLUt;T(2{)_r*{?r#cmb{V%z
z0WWW#wy~kz-yEpl-ED2y9goEQp`a}gZ1i_D&4^`SBRw4!<ID!Bu)w^q`ciTE%eM)B
zF~oaVXXz^MrhB(`cGPr~wck;@TVj2QNS7?hJyjf6wWYK@tVDQcaBD2GeM_nHE8^nB
z0?uB-3nijM3rkeQbXcii1Z>DIJM0QO6--}q=<A|MSfeeWft^r`!^tc&8X3l!pN`{e
zjwiagYP+}BA1m7;gjYH2O+laIUe7&kvfLZk(YwXVi?)QnyVc()NX->HHb*MGuEv^B
zt;<oqZt7Gt?*)7!C9K^l@}k4x@CV|N=Gk9FoLC|%xc%Ejg}qt+((&1+F7<3aal4U9
zr{l)}cjS*TJkOyu$V6J;RP@auT2C%xQfp|UDKvkH@q8X#N};(}M?qX64H*>Fz^qSo
zRovuKZ8bBkG6`|2U&H-l604j|=jck>pye^Hy0|E0fK+`*OJCAT!zHZo36}mFD%4mh
zSqk?p2r2xbfNM$GZ(NJMK-aL`Br?#cZwHEm4E5qJ;u?bV*!4a_Z~m5%x(j5U%FJOp
zGCtA0Ous?BYg%Az%zDT0Zq_51mAWVv*W+XAg+~dOI&z3`t9?VnHfU9y!$h9;%&1=u
z5u&ON6SeA@!^G|C<zZqq^}wEz4E4|uA*maNiTs;#och8rapz6BHubK@hz(Fs`yL}s
z!eVux1zOY(o*)*e%;Ut;u^&B7d`eSUZvvm%e}Gu3?m0vl)T;-H0?i(cY#Xb}o!;_-
zN_ScLj)Fq<-2=oOkW=A7;uPf7HxCkbYYrEv!XaW0cKF#t#1Lf1u-_*wqtveJ_>;+C
zrfoP#>s0xpOq4+nOn)%$&DvzpGp9#6^GnRm!L>B)+DkhFk!VAhYwzxKG{m`9CEgSe
zqGC@I*U>2i8^hh*Zf{Jijh04z@$F%EMLApRbvM<PHFUfA&0$YXrR4Hf3odUU?x}I{
z?g}60DQn=>ynOPJzRDg~S&a928~EC&tJlT*x_!NsU9Jju6w8V3Xan!^ZjZWaDtp{z
zfk<slx!@`DiIvUlP4M&fY4A%9S(MqqwN%P$dvijF2f{6UG#m|dMth@)`p%A6eS}lm
z+nTy!QS3GM&ABaTKavDF^&?4^C50bcOQzgTgo2LN27ACCZx<WugAp#==IDqwv(e7_
zSQ8sizEQV1M**&q__rM{l$;_-Ja(H%x!u|#B-(bjDou^8a!eNLx$th84|Ui>Y^1wc
z<P)BnDlX>nHgtQuTYKF#<)SNIE%<mJUt6}dx3+9^)Kj)8;wh`{c6psWK7Lc!=Pixj
z0EytL!JzO~az4JgyEYo*+|d~8^Wx_UcN~KY1Ex}{jl09Hcx|}W+rWCfxKPdj31=^0
zg%XY}5qT?aOM)T|u7xSL>w~dCthX!1CVE4O7NH^3*&L0wcE!6JBMu=N#PI!J-EOS>
zKiy`F1y0*->^7@dC061cY`PrA0g9vd&=}f>_TfS&qrO$73*IVAX-()>NkM5sw}K$4
z3C%q4d%o(#iIt>_xz+xr1A0*VazBZlK@Xxv9FQ0F<&jP})!*i)I6aF!FO{g7?D>!-
UXR+r&gUBVFE10S7IsXj)3rF3E&;S4c

diff --git a/sandboxMP/__pycache__/settings.cpython-36.pyc b/sandboxMP/__pycache__/settings.cpython-36.pyc
index 294207ea8aaeef6f28c4b65030ad56ba3b5ffed9..81d3f737e40d974fadf967a30ccbe7134a8790b6 100644
GIT binary patch
delta 409
zcmZ{dOG?9F6ovaI(V9Z*qc0zQX<M~w6Scku4wRyTAcCD;L5Mv+AvJAElTyt@q$`k)
zgpS=n-GOUx1<qZ97#&n6-pe_BTn^{Hg&(5XQZN{Jc>cKj4EcQTzCR;-eBjC6d(3w3
z5kXX!DTEk}BTf^T=By^xWbVgISI`+oFpD`PkVHzC42E=H(iu%6LsOW?!Z4lf3dr>Z
zgHafHEPBa2mVSKs#|sA2C5m8$qFALEMkwy-WEyKUgCflii<IxTGzXOu!`pgSpd>aZ
zg-vXrge|Dp#*Xf%G=z$;usb+qZLyr!noV1=?`((HmAV0#yrZ?aa>g6&vSpgQ>KInT
z{V#TLtyKpvQczS}@k-6Pe$}*etL=DTG{A3F4>Z(`hUx~?>J5kCSS_`X8NB*6HcDfa
Y!{eh~Mm}dwuPGOMPx5|95(W0VU;E%}NdN!<

delta 253
zcmZn^y(+A1%*)Hwxa?W<eO?BJ#|%h-1ITs&;$o$V%H{Rx>`{CvB2oM)qEP}VVyTQ-
z%vqeN>?z{SOzDg%tSJ&Hk||Ot(kU|OESZccvU6C{8KVSK<f4R9<Wm&jsui1=Qk3Q}
zWimzyrzoeW097idsDeo~FsYu&n9dR<lA;kMnxYvcmckk(4#W~ET2Y3QDcVs|aD#L}
z)<#LE=tjxF#q^q)qGVI_qvTSUf*CXoHYYHaGH+I9WnyO1l;0f8k;piCAE!5C(qt|!
J-O1Km761z<Irsno

diff --git a/sandboxMP/settings.py b/sandboxMP/settings.py
index 30bcdb9..4c9b652 100644
--- a/sandboxMP/settings.py
+++ b/sandboxMP/settings.py
@@ -50,6 +50,8 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'apps.system.middleware.MenuCollection',
+    'apps.system.middleware.RbacMiddleware',
 ]
 
 ROOT_URLCONF = 'sandboxMP.urls'
@@ -132,3 +134,13 @@ MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 LOGIN_URL = '/login/'
+
+# safe url
+SAFE_URL = [r'^/$',
+            '/login/',
+            '/logout',
+            '/index/',
+            '/media/',
+            '/admin/',
+            '/ckeditor/',
+            ]
\ No newline at end of file
diff --git a/templates/base-left.html b/templates/base-left.html
index 2856245..9a14eef 100644
--- a/templates/base-left.html
+++ b/templates/base-left.html
@@ -21,20 +21,32 @@
       <!-- /.search form -->
 
       <!-- Sidebar Menu -->
- <ul class="sidebar-menu">
+     <ul class="sidebar-menu">
         <li class="header"></li>
         <!-- Optionally, you can add icons to the links -->
-        <li class="treeview">
-          <a href="#"><i class="fa fa-calendar"></i> <span>一级菜单</span>
-            <span class="pull-right-container">
-              <i class="fa fa-angle-left pull-right"></i>
-            </span>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="#"><i class="fa fa-caret-right"></i>二级菜单</a></li>
-            <li><a href="#"><i class="fa fa-caret-right"></i>二级菜单</a></li>
-          </ul>
-        </li>
+         {% for menu in request.reveal_menu %}
+            {% if not menu.url %}
+                <li class="treeview" id="{{ menu.code }}">
+                    <a href="">
+                        <i class="{{ menu.icon }}"></i><span>{{ menu.name }}</span>
+                        <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i>
+                        </span>
+                    </a>
+                    <ul class="treeview-menu">
+                        {% for sub in  menu.sub_menu %}
+                            <li id="{{ sub.code }}">
+                                <a href="{{ sub.url }}"><i class="fa fa-caret-right"></i>{{ sub.name }}</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </li>
+            {% else %}
+                <li id="{{ menu.code }}">
+                    <a href="{{ menu.url }}"><i class="{{ menu.icon }}"></i><span>{{ menu.name }}</span>
+                    </a>
+                </li>
+            {% endif %}
+        {% endfor %}
       </ul>
       <!-- /.sidebar-menu -->
     </section>
diff --git a/templates/head-footer.html b/templates/head-footer.html
index ac0b4de..a7c97bd 100644
--- a/templates/head-footer.html
+++ b/templates/head-footer.html
@@ -20,9 +20,13 @@
                 <span class="sr-only">Toggle navigation</span>
             </a>
             <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                <ul class="nav navbar-nav">
-                    <li class="active" ><a href="#" id="index">头部导航</a></li>
-                </ul>
+                {% for menu in request.top_menu %}
+                    <ul class="nav navbar-nav">
+                        <li {% ifequal menu.status True %}class="active" {% endifequal %}>
+                            <a href="{{ menu.url }}" id="{{ menu.code }}">{{ menu.name | default_if_none:"" }}</a>
+                        </li>
+                    </ul>
+                {% endfor %}
             </div>
             {% if request.user.is_authenticated %}
                 <div class="navbar-custom-menu">
diff --git a/templates/system/menu_form.html b/templates/system/menu_form.html
index d681c13..57bae9b 100644
--- a/templates/system/menu_form.html
+++ b/templates/system/menu_form.html
@@ -18,9 +18,9 @@
                         <div class="col-sm-3">
                             <input class="form-control" name="name" type="text"/>
                         </div>
-                        <label class="col-sm-2 control-label">代码</label>
+                        <label class="col-sm-2 control-label">编号</label>
                         <div class="col-sm-3">
-                            <input class="form-control" name="code" type="text"/>
+                            <input class="form-control" name="number" type="text"/>
                         </div>
                     </div>
                     <div class="form-group has-feedback">
@@ -43,7 +43,12 @@
                         <div class="col-sm-8">
                             <input class="form-control" name="url" type="text" />
                         </div>
-
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">代码</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="code" type="text"/>
+                        </div>
                     </div>
                 </fieldset>
             </div>
diff --git a/templates/system/menu_update.html b/templates/system/menu_update.html
index 8b8edc6..f773639 100644
--- a/templates/system/menu_update.html
+++ b/templates/system/menu_update.html
@@ -18,9 +18,9 @@
                         <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>
+                        <label class="col-sm-2 control-label">编号</label>
                         <div class="col-sm-3">
-                            <input class="form-control" name="code" type="text" value="{{ menu.code }}"/>
+                            <input class="form-control" name="number" type="text" value="{{ menu.number }}"/>
                         </div>
                     </div>
                     <div class="form-group has-feedback">
@@ -32,6 +32,7 @@
                         <div class="col-sm-3">
                             <select class="form-control select2" name="parent">
                                 <option value="{{ menu.parent.id }}">{{ menu.parent.name }}</option>
+                                <option value=""> </option>
                                 {% for parent_menu in menu_all %}
                                     <option value={{ parent_menu.id }}> {{ parent_menu.name }} </option>
                                 {% endfor %}
@@ -44,6 +45,12 @@
                             <input class="form-control" name="url" type="text" value="{{ menu.url | default:'' }}"/>
                         </div>
                     </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">代码</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" name="code" type="text" value="{{ menu.code | default:'' }}"/>
+                        </div>
+                    </div>
                 </fieldset>
             </div>
             <div class="box-footer ">
diff --git a/templates/system/role.html b/templates/system/role.html
index c71d519..51008cf 100644
--- a/templates/system/role.html
+++ b/templates/system/role.html
@@ -60,7 +60,13 @@
     <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>
+    <script type="text/javascript">
+        $(function () {
+            $('#SYSTEM-RBAC').addClass('active');
+            $('#SYSTEM-RBAC-ROLE').addClass('active');
 
+        });
+    </script>
 <script type="text/javascript">
  var oDataTable = null;
     $(function () {
diff --git a/templates/system/structure/structure.html b/templates/system/structure/structure.html
index 155bacd..c595a1f 100644
--- a/templates/system/structure/structure.html
+++ b/templates/system/structure/structure.html
@@ -57,6 +57,13 @@
 <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
 <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
 
+<script type="text/javascript">
+    $(function () {
+        $('#SYSTEM-BASIC').addClass('active');
+        $('#SYSTEM-BASIC-STRUCTURE').addClass('active');
+
+    });
+</script>
 <script type="text/javascript">
     var oDataTable = null;
     $(function () {
diff --git a/templates/system/users/user.html b/templates/system/users/user.html
index 93176a6..a130ea3 100644
--- a/templates/system/users/user.html
+++ b/templates/system/users/user.html
@@ -88,6 +88,14 @@
 <script src="{% static 'plugins/datatables/dataTables.const.js' %}"></script>
 <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
 
+<script type="text/javascript">
+    $(function () {
+        $('#SYSTEM-BASIC').addClass('active');
+        $('#SYSTEM-BASIC-USER').addClass('active');
+
+    });
+</script>
+
 <script type="text/javascript">
     var oDataTable = null;
     $(function () {

From 0b476737598a55e66949480238e944030250afae Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Fri, 16 Nov 2018 23:03:09 +0800
Subject: [PATCH 8/9] system config

---
 .idea/workspace.xml                | 410 +++++++++++++----------------
 apps/custom.py                     |  10 +
 apps/system/models.py              |   2 +-
 apps/system/views.py               |   9 +-
 apps/system/views_menu.py          |   4 +-
 apps/system/views_role.py          |   4 +-
 apps/system/views_structure.py     |   3 +-
 apps/system/views_user.py          |   3 +-
 db.sqlite3                         | Bin 221184 -> 221184 bytes
 requirements/dev                   |   2 +
 requirements/pro                   |   2 +
 templates/base-left.html           |   9 +-
 templates/system/system_index.html |  83 +++++-
 13 files changed, 302 insertions(+), 239 deletions(-)
 create mode 100644 requirements/dev
 create mode 100644 requirements/pro

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e4c321..bc94cef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80da5b45-7eca-459a-bbe3-5443bc141768" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/apps/system/migrations/0002_auto_20181115_2124.py" />
       <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/models.py" afterPath="$PROJECT_DIR$/apps/system/models.py" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views.py" afterPath="$PROJECT_DIR$/apps/system/views.py" />
       <change beforePath="$PROJECT_DIR$/apps/system/views_menu.py" afterPath="$PROJECT_DIR$/apps/system/views_menu.py" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views_structure.py" afterPath="$PROJECT_DIR$/apps/system/views_structure.py" />
+      <change beforePath="$PROJECT_DIR$/apps/system/views_user.py" afterPath="$PROJECT_DIR$/apps/system/views_user.py" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change beforePath="$PROJECT_DIR$/sandboxMP/settings.py" afterPath="$PROJECT_DIR$/sandboxMP/settings.py" />
       <change beforePath="$PROJECT_DIR$/templates/base-left.html" afterPath="$PROJECT_DIR$/templates/base-left.html" />
-      <change beforePath="$PROJECT_DIR$/templates/head-footer.html" afterPath="$PROJECT_DIR$/templates/head-footer.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/menu_form.html" afterPath="$PROJECT_DIR$/templates/system/menu_form.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/menu_update.html" afterPath="$PROJECT_DIR$/templates/system/menu_update.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/role.html" afterPath="$PROJECT_DIR$/templates/system/role.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/structure/structure.html" afterPath="$PROJECT_DIR$/templates/system/structure/structure.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/users/user.html" afterPath="$PROJECT_DIR$/templates/system/users/user.html" />
+      <change beforePath="$PROJECT_DIR$/templates/system/system_index.html" afterPath="$PROJECT_DIR$/templates/system/system_index.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -28,11 +26,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="settings.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="293">
-              <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
+            <state relative-caret-position="225">
+              <caret line="53" column="4" lean-forward="false" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="4" />
               <folding>
                 <element signature="e#310#319#0" expanded="true" />
               </folding>
@@ -40,56 +38,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="head-footer.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="18" column="85" lean-forward="false" selection-start-line="18" selection-start-column="85" selection-end-line="18" selection-end-column="85" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="base-left.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/base-left.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="role.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/role.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="71" column="19" lean-forward="false" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="structure.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/structure/structure.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="310">
-              <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="65" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="user.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/system/users/user.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="96" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -115,8 +63,6 @@
         <option value="$PROJECT_DIR$/apps/system/mixin.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$/apps/system/tests.py" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure_create.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/strueture_users.html" />
@@ -126,32 +72,38 @@
         <option value="$PROJECT_DIR$/templates/system/users/user_detail.html" />
         <option value="$PROJECT_DIR$/templates/base-static.html" />
         <option value="$PROJECT_DIR$/templates/system/users/passwd_change.html" />
-        <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/apps.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
         <option value="$PROJECT_DIR$/templates/system/menu_list.html" />
         <option value="$PROJECT_DIR$/templates/system/role_create.html" />
         <option value="$PROJECT_DIR$/templates/system/role_update.html" />
-        <option value="$PROJECT_DIR$/apps/custom.py" />
         <option value="$PROJECT_DIR$/templates/system/role_role2user.html" />
-        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
         <option value="$PROJECT_DIR$/templates/system/role_role2menu.html" />
         <option value="$PROJECT_DIR$/apps/system/urls.py" />
-        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
-        <option value="$PROJECT_DIR$/apps/system/models.py" />
         <option value="$PROJECT_DIR$/templates/system/menu_form.html" />
         <option value="$PROJECT_DIR$/templates/system/menu_update.html" />
         <option value="$PROJECT_DIR$/apps/system/milddleware.py" />
         <option value="$PROJECT_DIR$/apps/milddleware.py" />
         <option value="$PROJECT_DIR$/templates/head-footer.html" />
-        <option value="$PROJECT_DIR$/templates/base-left.html" />
         <option value="$PROJECT_DIR$/templates/system/structure/structure.html" />
         <option value="$PROJECT_DIR$/templates/system/users/user.html" />
         <option value="$PROJECT_DIR$/templates/system/role.html" />
-        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
         <option value="$PROJECT_DIR$/apps/system/middleware.py" />
+        <option value="$PROJECT_DIR$/apps/system/models.py" />
+        <option value="$PROJECT_DIR$/apps/custom.py" />
+        <option value="$PROJECT_DIR$/apps/system/views.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_menu.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_role.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
+        <option value="$PROJECT_DIR$/apps/system/views_user.py" />
+        <option value="$PROJECT_DIR$/templates/base-left.html" />
+        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
+        <option value="$PROJECT_DIR$/templates/system/index.html" />
+        <option value="$PROJECT_DIR$/templates/system/system_index1.html" />
+        <option value="$PROJECT_DIR$/templates/system/system_index.html" />
+        <option value="$PROJECT_DIR$/requirements/dev" />
+        <option value="$PROJECT_DIR$/requirements/pro" />
       </list>
     </option>
   </component>
@@ -162,10 +114,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-1448" />
+    <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="1456" />
-    <option name="height" value="876" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -209,12 +161,7 @@
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <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="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="requirements" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -239,17 +186,17 @@
     </option>
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\ProjectFile\sandboxMP\apps" />
-      <recent name="D:\ProjectFile\sandboxMP\templates\system" />
-    </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" />
       <recent name="D:\ProjectFile\sandboxMP\templates\system\structure" />
       <recent name="D:\ProjectFile\sandboxMP\apps\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">
     <option name="ruleStates">
@@ -314,31 +261,45 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1448" y="-8" width="1456" height="876" extended-state="6" />
+    <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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2232747" 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="false" show_stripe_button="true" weight="0.1962111" sideWeight="0.49573562" 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="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.27005732" 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.20095949" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28281462" 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="true" show_stripe_button="true" weight="0.2274211" 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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2232747" sideWeight="0.49573562" 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="manage.py@sandboxMP" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34912044" 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.27005732" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28281462" 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" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -361,51 +322,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/static/plugins/datatables/dataTables.const-1.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
-        </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">
-          <caret line="220" column="33" lean-forward="true" selection-start-line="220" selection-start-column="33" selection-end-line="220" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/user_create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1396">
-          <caret line="129" column="26" lean-forward="false" selection-start-line="129" selection-start-column="26" selection-end-line="129" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-static.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="73" lean-forward="true" selection-start-line="14" selection-start-column="73" selection-end-line="14" selection-end-column="73" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/user_detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="967">
-          <caret line="191" column="14" lean-forward="false" selection-start-line="191" selection-start-column="14" selection-end-line="191" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/users/passwd_change.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/Envs/sandboxMP/Lib/site-packages/django/contrib/auth/decorators.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-459">
@@ -490,16 +406,6 @@
         </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="-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="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/apps/system/apps.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -531,14 +437,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="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$/templates/system/role_update.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="657">
@@ -602,36 +500,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="92" column="32" lean-forward="true" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
-          <folding>
-            <element signature="e#78#89#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="493">
-          <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#41#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/apps/custom.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="672">
-          <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
-          <folding>
-            <element signature="e#73#84#0" expanded="false" />
-          </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="153">
@@ -693,7 +561,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
           <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -721,22 +588,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="28" column="16" lean-forward="false" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" />
-          <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="330">
-          <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="96" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/system/role.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="540">
@@ -753,26 +604,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/apps/system/middleware.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
-          <caret line="96" column="45" lean-forward="true" selection-start-line="96" selection-start-column="45" selection-end-line="96" selection-end-column="45" />
-          <folding>
-            <element signature="e#0#9#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
-          <folding>
-            <element signature="e#310#319#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/head-footer.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -781,14 +612,151 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
+    <entry file="file://$PROJECT_DIR$/apps/custom.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="20" column="49" lean-forward="true" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
+          <folding>
+            <element signature="e#73#84#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="170">
+          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#45#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="204">
+          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#41#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/views_role.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
-          <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+          <caret line="19" column="52" lean-forward="false" selection-start-line="19" selection-start-column="52" selection-end-line="19" selection-end-column="52" />
+          <folding>
+            <element signature="e#78#89#0" 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="254">
+          <caret line="21" column="58" lean-forward="false" selection-start-line="21" selection-start-column="58" selection-end-line="21" selection-end-column="58" />
+          <folding>
+            <element signature="e#83#94#0" expanded="false" />
+          </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="255">
+          <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/base-left.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="66" column="21" lean-forward="false" selection-start-line="66" selection-start-column="21" selection-end-line="66" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/apps/system/middleware.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="96" column="45" lean-forward="false" selection-start-line="96" selection-start-column="45" selection-end-line="96" selection-end-column="45" />
+          <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="440">
+          <caret line="83" column="7" lean-forward="true" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
+          <folding>
+            <element signature="e#78#87#0" expanded="false" />
+          </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="238">
+          <caret line="14" column="50" lean-forward="true" selection-start-line="14" selection-start-column="50" selection-end-line="14" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/system_index1.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="106" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/invoice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="107">
+          <caret line="494" column="0" lean-forward="false" selection-start-line="494" selection-start-column="0" selection-end-line="668" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/requirements/pro">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/requirements/dev">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/system_index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="33">
+          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+          <folding>
+            <element signature="n#div#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#1;n#div#0;n#div#2;n#section#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="53" column="4" lean-forward="false" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="4" />
+          <folding>
+            <element signature="e#310#319#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/apps/custom.py b/apps/custom.py
index b7d92db..6c2e497 100644
--- a/apps/custom.py
+++ b/apps/custom.py
@@ -9,6 +9,16 @@ from django.shortcuts import HttpResponse
 from django.http import Http404
 
 from system.mixin import LoginRequiredMixin
+from system.models import Menu
+
+
+class BreadcrumbMixin:
+
+    def get_context_data(self, **kwargs):
+        menu = Menu.get_menu_by_request_url(url=self.request.path_info)
+        if menu is not None:
+            kwargs.update(menu)
+        return super().get_context_data(**kwargs)
 
 
 class SandboxGetObjectMixin:
diff --git a/apps/system/models.py b/apps/system/models.py
index 63e7e06..9522c78 100644
--- a/apps/system/models.py
+++ b/apps/system/models.py
@@ -26,7 +26,7 @@ class Menu(models.Model):
         try:
             return dict(menu=Menu.objects.get(url=url))
         except:
-            pass
+            None
 
 
 class Role(models.Model):
diff --git a/apps/system/views.py b/apps/system/views.py
index a2c097f..0ef5235 100644
--- a/apps/system/views.py
+++ b/apps/system/views.py
@@ -1,11 +1,10 @@
-from django.shortcuts import render
-from django.views.generic.base import View
+from django.views.generic import TemplateView
 
 from .mixin import LoginRequiredMixin
+from custom import BreadcrumbMixin
 
 
-class SystemView(LoginRequiredMixin, View):
+class SystemView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
 
-    def get(self, request):
-        return render(request, 'system/system_index.html')
+    template_name = 'system/system_index.html'
 
diff --git a/apps/system/views_menu.py b/apps/system/views_menu.py
index 037e276..2857516 100644
--- a/apps/system/views_menu.py
+++ b/apps/system/views_menu.py
@@ -1,7 +1,7 @@
 from django.views.generic import ListView
 
 from .mixin import LoginRequiredMixin
-from apps.custom import SandboxCreateView, SandboxUpdateView
+from apps.custom import SandboxCreateView, SandboxUpdateView, BreadcrumbMixin
 from .models import Menu
 
 
@@ -14,7 +14,7 @@ class MenuCreateView(SandboxCreateView):
         return super().get_context_data(**kwargs)
 
 
-class MenuListView(LoginRequiredMixin, ListView):
+class MenuListView(LoginRequiredMixin, BreadcrumbMixin, ListView):
     model = Menu
     context_object_name = 'menu_all'
 
diff --git a/apps/system/views_role.py b/apps/system/views_role.py
index f47f330..aecc746 100644
--- a/apps/system/views_role.py
+++ b/apps/system/views_role.py
@@ -12,12 +12,12 @@ from django.shortcuts import render
 
 from .mixin import LoginRequiredMixin
 from .models import Role, Menu
-from custom import SandboxCreateView, SandboxUpdateView
+from custom import SandboxCreateView, SandboxUpdateView, BreadcrumbMixin
 
 User = get_user_model()
 
 
-class RoleView(LoginRequiredMixin, TemplateView):
+class RoleView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
     template_name = 'system/role.html'
 
 
diff --git a/apps/system/views_structure.py b/apps/system/views_structure.py
index a6f8f39..f99d5be 100644
--- a/apps/system/views_structure.py
+++ b/apps/system/views_structure.py
@@ -14,11 +14,12 @@ from django.contrib.auth import get_user_model
 from .mixin import LoginRequiredMixin
 from .models import Structure
 from .forms import StructureForm
+from apps.custom import BreadcrumbMixin
 
 User = get_user_model()
 
 
-class StructureView(LoginRequiredMixin, TemplateView):
+class StructureView(LoginRequiredMixin,  BreadcrumbMixin, TemplateView):
 
     template_name = 'system/structure/structure.html'
 
diff --git a/apps/system/views_user.py b/apps/system/views_user.py
index d575a31..2066631 100644
--- a/apps/system/views_user.py
+++ b/apps/system/views_user.py
@@ -17,6 +17,7 @@ from django.db.models import Q
 from .forms import LoginForm, UserCreateForm, UserUpdateForm, PasswordChangeForm
 from .mixin import LoginRequiredMixin
 from .models import Structure, Role
+from apps.custom import BreadcrumbMixin
 
 User = get_user_model()
 
@@ -63,7 +64,7 @@ class LogoutView(View):
         return HttpResponseRedirect(reverse('login'))
 
 
-class UserView(LoginRequiredMixin, TemplateView):
+class UserView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
     template_name = 'system/users/user.html'
 
 
diff --git a/db.sqlite3 b/db.sqlite3
index a38cd4760f9e23c2941489499d395474be1e1a78..364f2cf85cd3b58efc9840bd8b709ad186b6e1ea 100644
GIT binary patch
delta 1090
zcmXxiJ4_T&6vpv$=gytoS$5~}SRTuQAljG^cVnR#3pK`4L&OFY*oN2$J`fc}mpfQl
zffU%0SlC&ZC7Bp3h>h3~8e?OOi7^<%V|l+>?>TDo{cbTc$;|u*r(%OsvEihc9;vw?
zrr&1X9k)a%mrO-xvmz9-U124K!&VE$CWOsa3CUIpi>(lXEf>JXp}>~G0b2_DYzgeK
z#jwjF?64kevoY9W+oG_^ha%WuBe2f8u*QaAl?}lP>%cOrAkW&c#7bCXEm&}D*R^2&
zRi=KVITVEIg_RyXpRXGY=bLhe>rZ%NFFM3<)(_d>iW=oRWK#KxtX95FCX_G9D&<>b
zrSb(?p?o0AmCllJrJs^zN<Se>l^!5VlzvPWEB%N>rTa-w>4#+On$i#G5LNm<S)_Cy
z8BzKk=_=hzhLyfchLpZTI!fOrmD0CJTj?HBD&0+5w!Rtcb&5=<`L#;Ambrsg@!GtS
z*WwktKnn%l1Kxe!J>Fg39o}u;E#6Ju4c>L$HQrU;><Y8Yo9A8PUF2QhosR%Oqc;P1
z3U@G#t9T6Ou>pT#62D;_zhDe!(ZNq%0Y7+KIO#3pg!dcYct7y9_Z7#z&-l`t!4Z6p
zLpXqa*n>APgROWaXqythJo6PC$$b+hZ^G0~n79ekHeu2xOxc79n=oAyCTqe}O_-<&
z(==g{CQQ+U>6tJ&6A?JKPMVqt6Ek62CQQnNDVZ=K6Q*OrWc=^@<V2>BdS*??aN2Ua
zf=F7PamA6bk0)i_p&Ai}1SD!*n9EJhO^&y;wp_h<Db?HGd#|fI6%3u0*Bx;*_<mM4
v7F*HXz-yLs(NdQ$D3Y~*59Z3T%k455G_=dOd8@UcsYAXOQS)P>{~z@SCNR9^

delta 1051
zcmXxiOGs346vy#%@0~N_9cTW>$M_rraTiE4y?kV*X73=RU6wi((xwM!ErLM**rrz6
z#&$uAz(t_W=yiOK&rt($6Kx`*h@x5)wTKApe-5?zeg2EPI``Y33HN8hgHdZ_sG`*x
z8B3)1*zhG8jfJ-R;6=daT6PpR#d6pX%V1qBg{)WtYhp31ibb#@MqpVige9>67R7wX
zh<UIe63mMV=EN|}itQnokw-2}i$O?>E=-9z;E4g46#XzEBBVqgBt-|tMH|NaKG(Hj
z^l74Us4d_HDlI#nbiX}N!;d<x!9IP~2d-6t`V1RIeVQ#teTpqZeUdFjeS$4PeVi>u
zeT*$a-O5H#A7u+sx3C4Mo7sHSO>7?OBP^kAWEJYeZ1^JT27ZK4A7XP+*Rw&?b*ziJ
zmd!z3!v;_vWc{cQu!wp;>qEVdbx`kRZJ&;Nf4Zzhm-(gWm;-FeZpg07W@Xo8S7ldZ
zmt~h^7iBZD3$pXFbF#CtGqTgNY1t`RPquGTn2=4$CS}KE$7Dx?08p*AfPPag{h&B~
zrQP&_s^|?x=@mt2o5Hj~ep*sHG^2h|N`0s2>N7o4@9BwpO^?+}8d6*IkOt@;-JzRw
zjS_T$&U@_{>yt89@H^5qW3pyU)r^UnF-<cjX~q=In4lTcGh=dQOwEjmnK3OhCS}Hy
z%$SZDlQ9#7<}_<6W=zD4X_zqyGp1n11k9Lz8I$k7`y{QzPVBy&a&qD}z4L-`r@^&a
zhO;$Jqc>3RT=H9f?`@M)ooCZePqjH8Lj^^#-n+fGyKlsLu3Wwv>$!Ekd-z<36ZNV(
VoQP!ucy*o5tQE?2cDet*{0j;#vx@)#

diff --git a/requirements/dev b/requirements/dev
new file mode 100644
index 0000000..4643bc9
--- /dev/null
+++ b/requirements/dev
@@ -0,0 +1,2 @@
+django==2.1.2
+pillow==5.3.0
\ No newline at end of file
diff --git a/requirements/pro b/requirements/pro
new file mode 100644
index 0000000..4643bc9
--- /dev/null
+++ b/requirements/pro
@@ -0,0 +1,2 @@
+django==2.1.2
+pillow==5.3.0
\ No newline at end of file
diff --git a/templates/base-left.html b/templates/base-left.html
index 9a14eef..f047efa 100644
--- a/templates/base-left.html
+++ b/templates/base-left.html
@@ -56,7 +56,14 @@
 
 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
-
+    <section class="content-header margin-bottom">
+        <ol class="breadcrumb">
+            {% if menu.parent %}
+            <li class="active"><a href="{{ menu.parent.url | default:'' }}">{{ menu.parent.name }}</a></li>
+            {% endif %}
+            <li class="active"><a href="{{ menu.url }}">{{ menu.name }}</a></li>
+        </ol>
+    </section>
   {% block content %}
 
 
diff --git a/templates/system/system_index.html b/templates/system/system_index.html
index 7120b27..5147279 100644
--- a/templates/system/system_index.html
+++ b/templates/system/system_index.html
@@ -4,14 +4,87 @@
 
 {% block content %}
 
+    <div class="pad margin no-print">
+        <div class="callout callout-info" style="margin-bottom: 0!important;">
+            <h4><i class="fa  fa-info-circle"></i>系统管理:</h4>
+            系统管理模块包含：系统权限管理和系统设置，系统权限管理可实现基于角色组的权限管理，可根据角色组权限动态生成URL导航菜单。
+        </div>
+    </div>
     <!-- Main content -->
-  <section class="content">
-    系统管理首页：system_index，content是页面定义的主要区域，
-    头部和底部内容以及导航栏都是通过模板继承的，之后的所有
-    功能前端页面都是在content内进行编辑。
-  </section>
+    <section class="invoice">
+        <div class="row">
+            <div class="col-xs-12">
+                <h2 class="page-header">
+                    <i class="fa fa-github"></i> RBAC权限管理历史版本
+                </h2>
+            </div>
+            <!-- /.col -->
+        </div>
+        <div class="row">
 
+            <div class="col-xs-12 table-responsive">
+          <table class="table table-striped">
+            <thead>
+            <tr>
+              <th>编号</th>
+              <th>TAG</th>
+              <th>发布日期</th>
+              <th>TAG地址</th>
+              <th>Commit</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+              <td>1</td>
+              <td>v1.19</td>
+              <td>2018-11-16</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.19</td>
+              <td>system config</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>v1.18</td>
+              <td>2018-11-16</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.18</td>
+              <td>rbac config</td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>v1.17</td>
+              <td>2018-11-14</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.17</td>
+              <td>role2menu</td>
+            </tr>
+            <tr>
+              <td>4</td>
+              <td>v1.16</td>
+              <td>2018-11-14</td>
+              <td>https://github.com/RobbieHan/sandboxMP/tree/v1.17</td>
+              <td>role2user</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+        <!-- /.col -->
+        </div>
+      <!-- /.row -->
+        <div class="row">
+            <!-- accepted payments column -->
+            <div class="col-xs-12">
+              <p class="lead">其他信息：</p>
+
+              <p class="text-muted well well-sm no-shadow" style="margin-top: 10px;">
+                <strong>权限管理开发文档获取地址（知识星球）：</strong> https://t.zsxq.com/a6IqBMr (微信中打开链接)<br>
+                <strong>知识星球快捷入口：</strong>微信公众号搜索[知识星球]，关注后发送52824366，获取星球连接。<br>
+                <strong>知乎专栏SandBox：</strong>https://zhuanlan.zhihu.com/sandbox <br>
+                <strong>轻量级办公管理系统项目开源地址：</strong>https://github.com/RobbieHan/gistandard <br>
+              </p>
+            </div>
+            <!-- /.col -->
+        </div>
+    </section>
     <!-- /.content -->
+    <div class="clearfix"></div>
 
 {% endblock %}
 

From 9d149a688235c1b9c7c3129a2c7e0ae2c64d5a7f Mon Sep 17 00:00:00 2001
From: RobbieHan <robbie_han@outlook.com>
Date: Sat, 17 Nov 2018 12:12:05 +0800
Subject: [PATCH 9/9] system config

---
 .idea/workspace.xml                           | 145 ++----------------
 apps/__pycache__/custom.cpython-36.pyc        | Bin 2340 -> 2800 bytes
 apps/system/__pycache__/models.cpython-36.pyc | Bin 3751 -> 3751 bytes
 apps/system/__pycache__/views.cpython-36.pyc  | Bin 588 -> 488 bytes
 .../__pycache__/views_menu.cpython-36.pyc     | Bin 1382 -> 1410 bytes
 .../__pycache__/views_role.cpython-36.pyc     | Bin 4662 -> 4690 bytes
 .../views_structure.cpython-36.pyc            | Bin 3625 -> 3678 bytes
 .../__pycache__/views_user.cpython-36.pyc     | Bin 8010 -> 8063 bytes
 db.sqlite3                                    | Bin 221184 -> 221184 bytes
 sandboxMP/__pycache__/settings.cpython-36.pyc | Bin 2689 -> 2803 bytes
 sandboxMP/settings.py                         |   8 +-
 11 files changed, 22 insertions(+), 131 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bc94cef..450747f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,16 +3,8 @@
   <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/custom.py" afterPath="$PROJECT_DIR$/apps/custom.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/models.py" afterPath="$PROJECT_DIR$/apps/system/models.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views.py" afterPath="$PROJECT_DIR$/apps/system/views.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_menu.py" afterPath="$PROJECT_DIR$/apps/system/views_menu.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_role.py" afterPath="$PROJECT_DIR$/apps/system/views_role.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_structure.py" afterPath="$PROJECT_DIR$/apps/system/views_structure.py" />
-      <change beforePath="$PROJECT_DIR$/apps/system/views_user.py" afterPath="$PROJECT_DIR$/apps/system/views_user.py" />
       <change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change beforePath="$PROJECT_DIR$/templates/base-left.html" afterPath="$PROJECT_DIR$/templates/base-left.html" />
-      <change beforePath="$PROJECT_DIR$/templates/system/system_index.html" afterPath="$PROJECT_DIR$/templates/system/system_index.html" />
+      <change beforePath="$PROJECT_DIR$/sandboxMP/settings.py" afterPath="$PROJECT_DIR$/sandboxMP/settings.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -29,8 +21,8 @@
       <file leaf-file-name="settings.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="53" column="4" lean-forward="false" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="4" />
+            <state relative-caret-position="597">
+              <caret line="151" column="34" lean-forward="true" selection-start-line="151" selection-start-column="34" selection-end-line="151" selection-end-column="34" />
               <folding>
                 <element signature="e#310#319#0" expanded="true" />
               </folding>
@@ -98,12 +90,12 @@
         <option value="$PROJECT_DIR$/apps/system/views_structure.py" />
         <option value="$PROJECT_DIR$/apps/system/views_user.py" />
         <option value="$PROJECT_DIR$/templates/base-left.html" />
-        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
         <option value="$PROJECT_DIR$/templates/system/index.html" />
         <option value="$PROJECT_DIR$/templates/system/system_index1.html" />
         <option value="$PROJECT_DIR$/templates/system/system_index.html" />
         <option value="$PROJECT_DIR$/requirements/dev" />
         <option value="$PROJECT_DIR$/requirements/pro" />
+        <option value="$PROJECT_DIR$/sandboxMP/settings.py" />
       </list>
     </option>
   </component>
@@ -113,7 +105,7 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -151,6 +143,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -161,13 +154,12 @@
             <path>
               <item name="sandboxMP" type="b2602c69:ProjectViewProjectNode" />
               <item name="sandboxMP" type="462c0819:PsiDirectoryNode" />
-              <item name="requirements" type="462c0819:PsiDirectoryNode" />
+              <item name="apps" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -261,45 +253,31 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" 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.24156693" sideWeight="0.5042644" 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.1962111" sideWeight="0.49573562" 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.18498367" 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.20095949" 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.26972282" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2274211" 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.28281462" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2232747" sideWeight="0.49573562" 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="manage.py@sandboxMP" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34912044" 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.27005732" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28281462" 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" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -326,9 +304,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-459">
           <caret line="9" column="57" lean-forward="false" selection-start-line="9" selection-start-column="57" selection-end-line="9" selection-end-column="57" />
-          <folding>
-            <element signature="e#0#27#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -336,9 +311,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="493">
           <caret line="29" column="63" lean-forward="true" selection-start-line="29" selection-start-column="63" selection-end-line="30" selection-end-column="0" />
-          <folding>
-            <element signature="e#633#665#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -346,7 +318,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
           <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -354,7 +325,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1649">
           <caret line="121" column="4" lean-forward="false" selection-start-line="121" selection-start-column="4" selection-end-line="121" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -369,9 +339,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-204">
           <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>
-            <element signature="e#0#53#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -400,9 +367,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
           <caret line="127" column="0" lean-forward="false" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
-          <folding>
-            <element signature="e#73#82#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -417,7 +381,6 @@
       <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>
@@ -425,7 +388,6 @@
       <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>
@@ -433,7 +395,6 @@
       <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>
@@ -441,7 +402,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="657">
           <caret line="80" column="14" lean-forward="false" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -449,7 +409,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="504">
           <caret line="70" column="11" lean-forward="true" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -457,7 +416,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
           <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="25" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -465,20 +423,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
           <caret line="69" column="39" lean-forward="true" selection-start-line="69" selection-start-column="39" selection-end-line="69" selection-end-column="39" />
-          <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>
@@ -486,7 +430,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="563">
           <caret line="98" column="20" lean-forward="false" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -494,9 +437,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2097">
           <caret line="177" column="13" lean-forward="true" selection-start-line="177" selection-start-column="13" selection-end-line="177" selection-end-column="13" />
-          <folding>
-            <element signature="e#1424#1456#0#HTML" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -504,7 +444,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
           <caret line="48" column="11" lean-forward="false" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -512,9 +451,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="510">
           <caret line="30" column="92" lean-forward="true" selection-start-line="30" selection-start-column="92" selection-end-line="30" selection-end-column="92" />
-          <folding>
-            <element signature="e#0#28#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -537,7 +473,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
           <caret line="11" column="35" lean-forward="true" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -545,7 +480,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="221">
           <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -553,7 +487,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="125" column="0" lean-forward="false" selection-start-line="125" selection-start-column="0" selection-end-line="125" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -568,7 +501,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="497">
           <caret line="89" column="0" lean-forward="false" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -576,7 +508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="310">
           <caret line="51" column="26" lean-forward="false" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -584,7 +515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
           <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="66" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -592,7 +522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="540">
           <caret line="71" column="19" lean-forward="false" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -600,7 +529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="310">
           <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="65" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -608,7 +536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
           <caret line="18" column="85" lean-forward="false" selection-start-line="18" selection-start-column="85" selection-end-line="18" selection-end-column="85" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -616,9 +543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
           <caret line="20" column="49" lean-forward="true" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
-          <folding>
-            <element signature="e#73#84#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -626,9 +550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
           <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#45#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -636,9 +557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
           <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#41#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -646,9 +564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
           <caret line="19" column="52" lean-forward="false" selection-start-line="19" selection-start-column="52" selection-end-line="19" selection-end-column="52" />
-          <folding>
-            <element signature="e#78#89#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -656,9 +571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="254">
           <caret line="21" column="58" lean-forward="false" selection-start-line="21" selection-start-column="58" selection-end-line="21" selection-end-column="58" />
-          <folding>
-            <element signature="e#83#94#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -666,7 +578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -674,7 +585,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="66" column="21" lean-forward="false" selection-start-line="66" selection-start-column="21" selection-end-line="66" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -682,7 +592,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="470">
           <caret line="96" column="45" lean-forward="false" selection-start-line="96" selection-start-column="45" selection-end-line="96" selection-end-column="45" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -690,9 +599,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="440">
           <caret line="83" column="7" lean-forward="true" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-          <folding>
-            <element signature="e#78#87#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -700,31 +606,15 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
           <caret line="14" column="50" lean-forward="true" selection-start-line="14" selection-start-column="50" selection-end-line="14" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/system/system_index1.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="106" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/invoice.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
-          <caret line="494" column="0" lean-forward="false" selection-start-line="494" selection-start-column="0" selection-end-line="668" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/system/system_index1.html" />
+    <entry file="file://$PROJECT_DIR$/templates/invoice.html" />
     <entry file="file://$PROJECT_DIR$/requirements/pro">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
           <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -732,7 +622,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
           <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -740,17 +629,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="33">
           <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <element signature="n#div#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#1;n#div#0;n#div#2;n#section#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/sandboxMP/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="53" column="4" lean-forward="false" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="4" />
+        <state relative-caret-position="597">
+          <caret line="151" column="34" lean-forward="true" selection-start-line="151" selection-start-column="34" selection-end-line="151" selection-end-column="34" />
           <folding>
             <element signature="e#310#319#0" expanded="true" />
           </folding>
diff --git a/apps/__pycache__/custom.cpython-36.pyc b/apps/__pycache__/custom.cpython-36.pyc
index e0346fbc7a6857511b473eb0428cdff8a55ce85e..458ff710416ceb8ca2c38f68c1761b5ea92762c5 100644
GIT binary patch
delta 1215
zcmZuwOHWfl6rQ>Fw!M891rcz8vcQWGA4HHu1$E&@jE~*LWKud)pxi!~xeZ{dn3RN-
zCglDBP29NAg-hA_A6(4J#DzQK(!`DDOnDTv$(%dioSE}|=bP!f6TkXKCbHSo+b=)o
z2a<$*Ctbe;%x7V!H#;LUWlnfJNLAB*nv#2jC%C&sxZAe;44@=W0ZIYN0!s4?pbVfK
zpe)Y;%88`N39B9R^RSlZ1z0PXwXCq)algRn6XNyke0a3!QSHo$TC>!ph1h#Qoq>rU
zKIO!>wn>?C%B?Nex3`Hyd<SaSI)6usA}`5ibzyFKeYsYmdxx<Ijx-E)8A3=Zv_&db
z#pd)CeQvcZPBvGP@?48noR-z5l!UQ1sl>~qMPH*r>jB8Kn=<ec5)IP*iy~xIkjoY}
zm=vo`p+W|Eo!A39*(iofY`Iph>v*%li=ogl)oci<3wX9vuZ3bgWRNI=cxPCNpseF7
zYel)Jw1cIAGRaseC@RI+`)Jl4+mv}A@4-G?2!s}>OH=gO@Uhm%|6zz}m$6#0Dj3r#
z#;SGR3~-)dY_(YoIvG=4XZJWuA_y3hy})CFN9E8-1brBgAH^sOf@?`P`WEl~RG?=m
z9g416FJltzjy_xGQ_`F|h48mEI*C{5*|Gp1?SgS~Ly1t^^@YkIm*LPUYy;LsDIAQ}
z?EBMLL-u1hjlsikpszDC;szmsJNCs5Mj7WLy%6m>Pp=`b(WV`=TB4iUmI6#K*JZV<
z9+uKhqpreB(ZkrparQ|p^gs47NL+-m&psCI#(vy9s$C}-<MmRvzg_yL;Pmx_3XYrt
zbHCojc6Geths*(xD8X}#m8K;*fveaNT$XX&=rf++-rLci#OULrN+c4QN^$^a2OaH~
zFsG*>H3LIA5M1g|i7Q@@yaFFTdg0D5`B}B0LQx%u$0Y(~{wL;{NW2b-u1IXmoIIpC
gY+JiGI`8sU47Mp0;#viop&1K?olEBWa_Qd0U%1f$;s5{u

delta 743
zcmZuuO=}cE5bd7n`Tk&yu7Y1NESiiYibjcoXf8p-T-4h}Xx8mcKzE&_dX}IkVa5B>
zf5D3<4+d`@yoo=duO9Rwc=0M$&yr;WJ5aCZRoAO|Rr9C$ey+8eW%20o@2$T9AwS5}
zgPg2msCT2*z0LbX_#${qL@;#PF|trZ$RcD3vREX@5*f)vIzz9WVlEXK=CV2$OLyqE
zGeMt_A|HKw^y!~-ozhTWV{al8fZQ8MRq4-csc9n4yS<K5oSTsImz}=kT>oN=3lW+r
zT*H*?ZJQ7k@Jh+bxaG6w9|)W#M6WrQGZXK~iepZ8tA^h2HXqEP&cvMeOEKtSGm~<@
zH|X@nt>G+QTlF-YvD7Xg$50MJ=s=*qdmrfq{n~$e>y#}>5De?Ujxzp>{rYr4D#Nx*
z=ufq@-3;3;RdrD(!Rl>m2+mnJZ(-TOECcg+(ZV=1Ft7K6pX*1}Cg5C@UCw8ASV8rb
zNe2d&>jipJAB0~v?BK>9Z_0RTuq&bVQZSf|2TNE41wujLn0>E}*88!(*YrWO*gR?p
z>=$8Ke|3)En2dEOua#G^;3kG*2q9$@Y^KQJ5*|jc#9I&R?StJwZMrU)HKGacjQ{Ih
W4{KEeA#@rvrKyv;c{5K=1pfinR+!`f

diff --git a/apps/system/__pycache__/models.cpython-36.pyc b/apps/system/__pycache__/models.cpython-36.pyc
index f2110477ed8f3b88c451b9c58eda0c47468f9237..3a070647eed743f2713b2c6cf3ed9f2518479154 100644
GIT binary patch
delta 16
XcmZ23yIhvtn3tC;>+rjc><jn+D&GZY

delta 16
XcmZ23yIhvtn3tC;yZG%!_62+ZDFFo-

diff --git a/apps/system/__pycache__/views.cpython-36.pyc b/apps/system/__pycache__/views.cpython-36.pyc
index 15a6daa4d4fcd894ac0bbd0f9695d6c2f88098ef..f3fd174367fbbff940fbe618e7f327de26899940 100644
GIT binary patch
delta 317
zcmX|+zfQw25XSH9I-oWY3`Jyv4Rzp;fRQ0$XDVVaLlxqah!h88C!(-0@B~$!qEErX
z$P;8`fdw%$aVgM~zVpx4cjvp;-n&eWqNooqpO@bN@Wxt3z?8832`2*v3$UmW!3ZM@
zVWpPLFiSSJB`Lxur314vhSBN=7r+SH@SN;zkybRTw}|g+r;bvSx!PWx<<q>(I^TaF
zL&EawoCq`;(88dWMsQEr_Q&_WB72e3-9zjby#ISl^3u?B@4B)@^N2ff8?kTk@1#sE
z&A|=0r5iN6c-TB+EcCGX!r`$K{M;(rjpBM82U+c_8|zf(@Am(zTvFH^h)pFz4CN1i
CTuJc&

literal 588
zcmYjO%}(4v44$7Pn{F3WAr9>$<j`>F4OIvU)LzO86^TQLGzzi11m$O$$+ipP1~1bm
z={wAo6R*%y?WBmcWX~7ReD>$~)7I8>@BGh2EQNRy8x|5iBzOB1K!B`8BQq%(t6DWW
z(}Xnyb<l)aD8*L+Aw-V?A`DSK1X%==Gm*s4#21P5k;N9!5(>^M{Pj!?Ilc3(TU70L
zyjfKi;iOtuZOM!mQv?pl-7W<bnFNt3kf0t#ra@DOz)#O^U5^cyE%`kgpPKxL+)XL;
z;$DJ$P{dI4yZ3IO?2U)1NZLBR>YF-|mZ^#Ify4TTpIDNHuKz9U8_NIvc)XvV+U^?5
z{!3M3?ur&JyY<OwUM!a`AM52mNs3FCw_Y!>XPz5$$-C`WsVQB}NquZgTQq2lpBmG2
zu&No)jJa7A^>}07Qi-AeM&O}rL}Bt$KUTx{Jel}+a9y;EE_GL(?aNi~hN=9A|LIZR
s0$a3InO+tSE&nVZHoO4K%O6T@wBso(_w@1SQRM-z(6NG<oT-`q2LworM*si-

diff --git a/apps/system/__pycache__/views_menu.cpython-36.pyc b/apps/system/__pycache__/views_menu.cpython-36.pyc
index b481154f8944789338f128d4533cf92ccee23516..da598deb5699645499ab0b9568b2a4eb5059a228 100644
GIT binary patch
delta 643
zcmZ`$Jx|;~5cT@|ljFl&AW<qLBsVmW4gsP78fc(EPT?5uUSwq7opyb2RggkTgk<?g
z&{9%T@GIORLC0@kW>4r+B$oDh_IYOByzz_s+gn)=0{7tQ?fW-PQJ$5*9uwjnIAU0@
zM0=$bTSTEMH43|QVuvXE3N@+qN1+xouC>^OyG<RqJ4|C1BiBak0q0T=IFFf-<JULq
zM5`ZH=i1ILXDQA2s60E&$9cbgxg&OSOMa0~6R4-hHYm47IiRd)&0fw5DtHIEAW5<!
z6(VCrktBQpI0+Hq^B9K+4ghu#Xu>8s(N*p=59;m@4~V14<csj;U4%~vn9P>|+J$V;
zuh_Us2509itCD_NvZ=}>k{Vwidk&7!0Z@Y@Q@?eap|(xj=3d*|Lbb@4boU|V0m2Ld
znu%0Ci!rwOm|q%_0-a_<-?;kUpnMsM+OT5fut+N==S;+?*UQJUH~);C|Gl2C@Cm&O
zv@O?z3qtlN3gVESr~RLUwTqlxisn^cCT&BE?g_Ubp*7_{5fe|iXK7m&Pt~StYVA!Z
W7!_=bK(4?g_^MAr;%l=`XuJc9j(R-+

delta 570
zcmZvZy-or_5XW!t`vVa9P$61jG#3*ZtPL?n3lnN`7D(L1KsX?~pjMiQFL3TN7~jHD
zOZ#h0?0f``GY6uDm+b#$XZC(G`@dW7-L2HpY4?eLoa8k{c~ky82E=t(q8C;CI#H-f
zjlLDyflZVng__j5Q>ev^sTMe}x2XerhiQyV^}vOUOFhVV%!CtObYCNC^t=^)J`zhl
zkZY2Wn`*OYL5J7~hm`eWv(sgLDtJalYJMjN6^`N)zKn4m#RkD8Obm!lbd}rkRo&lk
zA<^(nUVt|*qO71`1HLM&T4{ShOt3Rv8Olf(ItcQ3Sq`)&apa43xQ9&Nm@zzvc?u<s
zlEIS7moUy^JfAXYl8l;>$NKKgzvJLXYanr9%)(K>J!Y*zJ7g^}>2$hR37ePj&|>5t
zd_rD_5?)RuZlDQh17;h3Dk#uidvHFiUUb=|kY9S~An@9wk*J<c#CRBT{IMMEi_OG$
bF}okKINFhbeml?2lBY)5&XSatb#lfxjSypA

diff --git a/apps/system/__pycache__/views_role.cpython-36.pyc b/apps/system/__pycache__/views_role.cpython-36.pyc
index 24020772453f2a4768feb07c100b22b094c37f3d..905c786936d4f1ed744a63029665163e13f13f1a 100644
GIT binary patch
delta 1799
zcmZ`(OK%iM5Z-z0%)TGv*{2O`Y{&5kTO<Kt8^R+9$qASUp(uypFl@HlFk&C3W>?A$
zq2<aU>I?Y`IYf~XB@#CzF1dvq=Y+(C3sEk)aEMaXvv|h~Ua4#A)jeN*U0uH||Fyhy
zGM~>pe)jjxbSaT|nTY)i)Gy)+O5ZPy?)T>0IVHi<<AiH(Cs>x{9wu0h=lC2q$4R$>
zzC0_SufWS=&8?zcWF@pqn4^w$w}zfFv(RI43p46y&oLWqdy>&WPlZ*{Q=NF4=&7+f
zdgkjB*F3r!tckAX#IqpQlt+pto+vBjuy_f0n{{B+`}Uguo!=KPlm~{5Re&vStDEH_
zs$>Q#ij)FH@w0mU3YMOLG6{=B21S_c4H)l+#;(u1EP&_?ib}0QS`|edSD>RvDY^nx
z@x0Iwf2cVz&|X&>=nggD!`SYMxTmjg&3teb6Jt5kFElZ51Xl!Cg(kvnh=24G$7^)9
z>5cYSd&s|XOqe;6Y5)QU4RIyebl!*G!SIK;0=jC#j}<tv3X0-s^07US!8gj9qlAXf
zJkRfc4eO$3)KkYW;N+ks9vLlVQT${yPA;Ph=txJ075ocL;P*y67{W)=!UMWKT2nL?
z@y6Jg<zthMndVISSi`_^TyObUlW5203uRuglxuuS8&}1%RO{9vs-YI}VVGh5?k)%3
z?{H{Q!UrTw6i6GPgwrI>lK2com~MBw-YDP@z&Uaf_81&__p9P^`qj~OiV#7L0%!0q
zREGmpPoO$s>AqyC9DSJjM0OWQpdXVd@BS0oYu@HV$<76`lASJZ1AI<7R12IUuhwP^
zG%}}D8`C1F+XC32IF%FXBOA+@#l9*2&78S<uwk&5JT~ZfUIggS8`#2QiLR(;G+j-l
zVN2eE$o^W4QGqm^72o6*FPtYd)5=?9O7f!?iIM+)o`28%x%dvx`Vcq|&CVU(xy#uB
zuJf~8OPYzUFxefn@hubnFuTX0=Ldm5=m)S(pt2;sAR!5sZ5(fqFDWFu<Qi(B-sAm|
zn<ME(I4t%q(>Ds6+XtD3t8|XM_Cs0T!IT@g-m<Ku4A}YQd7+>z5XG>7A~g2e*wjNL
zdP4hAdX`bc<w4Rer-1Ap`MvA3cZo!cgnS3G>WgH~v{k%xnq;zcHv@w%_o(PVz6&=Q
z>HDwMgvtB(p|o*$<@@OoV{!`>?Bj~YsfNRdJkAkV7Paz^mkNYIJ_j1&a`*zxN1!nV
lG#P-J6No#xGj<u#1QGw0S1emKG+QqvtyIadvetrC`yW>QNcjK&

delta 1754
zcmZ`(&2JM&6!(63*YQ{E&Dyb@1VR!Ltb~v9Q735w;X<N>4}mzDgIReduwoO3x9d|S
z5K0fdP$`-Ve*mYRDj{+1KhUb`sah_TdY~67ao_+a-kUXeF^Q#lp7)zKZ{GXuZ|1L=
zmowAna=G-+&YL^0hZBi^6R}?s=c_pU^!{}Bv6A3Jdx_@AT7qR*_QwRv@+>#^^rnqS
zj^z=_^WvV?ETKQl3g{OwLdA$OB1L8)VsQ&2M$sQ(Hu`oiqJl_?l@TfTkSZdhtb#~I
zA|<_9L#WDX2-SK)W8$pxR8hrm%B*;+mqku}V2ohJFd`nQi^V)nZE8S8lTsir{@1JG
zAGNW8ttOyArbs4@CQNR3823VB%jF*PA<9Fmaz=Tegr<VS*U_XDU4haIN3)a?fuROG
zh;6gQPx{HFfs^JiFc#BKUB!h798s+*RI%3e`7-4-Tispe1pIp4gn@KaIE<312q#&q
zA5`=STt1G&H_%YgSoR6wXy?V>$!B&A!4JwpT?q}BwOa1ZZCDUax{^AA3-v4<70->y
zYsb(bX1styXdq1-CmMn<O=gB-b)Zv16Zpd}_XC)f9wzl%^!k<AqG&b-d1+9ZeoUX2
zd0e3JiI;it#C)&R#1E;a@eOU76R%Q}cV&T^&x0_{+^sDRe5cLfC<RQCG0`A>R3Tg-
zvrOhYG~tlrd9AL`!H4e&q`G6J$PYg!?hO5RWPw(Qu(|?E_!p`{2dAfS+GFjpWUUw-
zOd^re0$J#3a^?3wLwn78Jdn&>Brn<axC5|CG1Lp3BUE!38>HFjH$jT?;adu)c0#>t
zV;h6DH$*nGy!oYYP*W||X}4NYL5H%xh-oQ*q#aFHQ$w&Q_A|c^$7nzbmc@2<>e32T
z((hWbFNu$&5hMO!j{nI1IrSCCdH|e<X8S&GKj5s#vnzSd4e~50CPjuxujAk)rcWJa
zb~$XjzVCK+e7Hh2X2`6Oks6lrjf-QQmZU<iip%**p)X9ShK6wSi)&vp3LCUXe%?db
z+{BPuI6kqdqzu@^n^+af@Vjwh6vohm#;$|<4UpF!%M)}XBW>kCvMevY6pB3Z2JM|9
z)0ez#@)BVK7d74~JzTQWW*RykZ*B9Pt}m}ZGa1c4_ijS(D*Re#9Nzrr@JNPo%S}AQ
z#SuN58oob-)W>03oGSjZvWgDSTP@#LpqCKn(E_^nKoSIEPHu{cTb^W#nl)<`R711$
PLefeV3@c-eTcaNV$rLr3

diff --git a/apps/system/__pycache__/views_structure.cpython-36.pyc b/apps/system/__pycache__/views_structure.cpython-36.pyc
index 7703ac18b247f20464d465129b4331cebe9c226b..352da3347c73c36ef95cf59a9fb5a5d1d8442bcf 100644
GIT binary patch
delta 1352
zcmZ`(%WD&15Z~QwlFd8WyqdlYMryZ6p+>Q9ib#7>57tXWV$AnN7B&xO6YDLM_8_7M
z`6vj2ch6pnr~VZSiXbQ=^bhdl%qD4KNfTx=``elMe)IV9Y5LoAp%{q-k55h?y^cuI
z4{7A%LwgIw{`s!3*JTn5Tk(3Ll#nGJIFL&Ej>IA?dML3d5Ag(74!or#Vlfs+ERLAx
zKrN*ZNiZD|y^o|3NwO3osXmfHB+W92Wco;!$qytW`<vL@Gh`>cD?;+yBwDfCz$>f@
zo%++e=1a37-pfZm9o;||MP(y_MMxPGTS28M5c#~XY|FW<>v5)%XgQu|ygehndrl_P
z_-M#Lad?DgHtcq#QRTak7hlwQc|!bBH&&)8dd3X|ZUbd3MeR0ps_hQ&a;*t<=n)}D
z_XM@owA)w2WAE}-l)xCNIH^md3{t}o*P=K`p_)RmRaBay`5`6tm7F;BcIC8a_*S1>
z#utVL6Zqq(mWeciXhM#jeJ?6j2N`+^nIm--m7&700$<JK7PDcN-VPbKhZD7;(EP^A
zIL<@oA>9RxSV9@}e4$TvN__Mm<?{FjsKbBdYuH_%$;xH3(d%tC3T`D~w-P9b=h~#4
z6K}NK@>t?7VaJat+?t1ET;|lzHStxuexCV-jV9JBC<Eq8$b4NK20p|_SHc5Xu^8Ox
z(nx@AMX%X6(Q;xPn?nnlHPhl{o3~+-Q1v0Ay=iz5bb`#R)i`ims$Qjwl!c~i_=jV0
zcM8@JEd?r;Ri@N7tdlDZDm`ve+aeJ9Gn*%$5z3CzZsI~05$-p-+iP^Zcl`fFKmq+6
zKVAp7t2Zdw20`Ac#VY`t1kh^1EkZpN#?CL7Z={NO@}#c1^*Ab(0jV*wx-X8yYdhn%
z?81SqV%j?>gPRcmLW~KR6PuA&drqj*YT1j`j@@q7Axs=x^7OCZ-YTG71sb~>IMUIx
jb#}D%dXsf5zDXCz&ZE+luzdC%*ox1S^6D8~(?kCNE6w`n

delta 1308
zcmZ`(J8u&~5WbhsXUC8D{0I&v5m<p-M5HK*P@X6fLg`2WG^Q|?ca2WE*w)+`I#PrJ
zi2|V&5)z`MprE2cX=$iw&`Cf+nSVfmnA!7-$g#EKx$kCn=lf>XKPw+9)wOgw`R(25
zgM+l9{8q+3G4%Iv`QKkvpR{=5SgB3#D=fv*&lHyCQ(QYXYB@wQEQ?4M5gid5k!hAg
zB-cmsh}bNTNWPC05Gk-CBE>#ZWa?eTDT$2wMtoLZn>jofa^jx0n@gcvq&hS-mIf*D
zB3}M<qAjcCl8hP}8@*6}#Dj`ZjW4qWd~{TxTt^Kpx9tawc9Y+OdGX6wRA+=0+ugiK
z*%g@x+y~mRmhl7VHG>}TdaDD65EVm#@&u#X@q?;(8r#@I%@oLx$&#5Pvq)x?B0b83
zJepZtzJbQltT^P6%DPxGnOYDp&8>%*@r7f-4E}_M=VBR2bm0O$n~xh_4=bd$zyg`8
zXdDAZ49u3xJ?6tDdONB>9!{mL3McMtPO5nnJSx}0j1^o1-5o6UYk8jbCT0Jq*HKl|
zW%at-jx?QdKr%>425<$VLjADO4RyC2gfYMCxdTSxqgCFR$U;^h#&KUMz^F1wgT&nu
zf34NCG|p9>C~V*w&{(1I5hq$zyidH%j?ah=C2^44KcXIiNk*!_j$WAU`5d~?X}KP+
z`#gX$p~ihgqxR?shDqkOS{yh|StP+S?LzH#;-fyvA%iVMYl(*E)oE)Vwkec4SDe(k
z+hS?zbZ#hqf2>0-=%BlbS^W+iMID%qj{l!T)Q~vd52@@L9k_!gj5R&p0N5pfW({r-
zsy7%rJ8k9|i)$1~%1S<=K{TK+p<j2zkJR@5q_I1<X`8t1EnI`Ek^n-S5-f;%`gt=d
ymHrsyr2-mNphnBEG5v<q99lbv9oF;sO}alm-3Cibsl#vNYo>0;?2>KSQ~v;OMeY#*

diff --git a/apps/system/__pycache__/views_user.cpython-36.pyc b/apps/system/__pycache__/views_user.cpython-36.pyc
index 4f7f5e71c72b23bdb453318d813f99186398501f..360386881408e81a80bed7f990dff77e390b8791 100644
GIT binary patch
delta 2997
zcmb7GO>7%Q6!!XOy-oesb>cX2oY--i*lv>kq^SzDA!$(4(l(`~l;RXD$2*}G{_ESd
z61apaNQfI~4hX422!VuDfkXob;J}X%6$qh9sFyu~%7qIDgoM-!yf@w^?&6j<(Y(xj
zZ|2Q>-+MFJAEy49N=^9v9lw72$HK&b!*SEm@*`t^8k_#!8>uf=HHQ``Co0KYQgX1s
znj<$j=g@*$=oN<+Vtq_rbLUcsY|~UkR2;i<LpTm=ojC3k<Lx-^(jqvH;EE*ku6c69
zh;?gG#G+P|5kz{lUPO8=B#p>wOzT6a&w?@t#kGD!`Yj}j$bgnWBw-;t5J_r-hzwfD
zC?Y9s2$3NR8AD{dHjK!yg^X*`la9>D?<B;0#%apHsv3j!pQMl!&PZnP5U_$)ghplY
zL}{f|<(I+{e%Tx2LDxAc#xJ-IpncyplZ|5lh}~)WXc$G)gH3m$QJfIvGu=Hr<G#{Q
zDD;xqTql-LtR(-_{j)U4zw@N!5t@_ce|grVIA4*cqZ=#Dt-!Pru%eMSYB0>N%LBcs
z|3)<3^_p&s@Gahlr~Ao`$#+14j5zmh>TMoE^u$S$=%Bf}8;#;rWJrqRU-s7Tef%k&
zRT2-i+pFC+docO|+Q!mo4_{NBn!R(i={H!VUM?6cUoBKv+v84PjM<Gi5=>Z!jq#IP
zevA;yTtIKs8I)>}Z-yD?yF2#Fqv(PxuXP;UyQ!_bRAOaKH@!=xvcW)yT{LU+{2RGC
z!hh+=-Z$Avj53F<NmhbMame#quSz34=$l!1ly;d$V|v+2vE0CN>>}t8nFtwDDI>$i
zN#Q7=kCQn@=5FUa%dhxuNNIk_KPS!e@BO>ggA^$U+i2AeGGp8qh~t!OU`!<?;W3(_
zSbOnOATdhOO>ezmpe9u~OOsBKu?a(JFY-?Vj~uh*(VNd}wPHU1Kcz<!QCyuKCdK7;
zDn6Lo$mi?ZJlqJry=xyj@tQj8FJvU30UQws(4EP6KwJi)jL_&9KNQ-xN(!5<Qq_Pg
zt(YcroJ@d>O>Cj4Q2e$EG)cs@$^I-k?xy`RI(5pPL*jpjM(?{?7H~y_)>>C%p+$oA
zY?D5m#|fx{QmX1kp;}}xj{uw`^8~q^FwZM$a#f_;-^{e1yrR~gqn;on1XO7_M&>k`
zvt(RkX32<p@U+w(EzE@)I)i+puF>^eszIf#4j!tB*SH#<u+t|;O96>e64xt_j#shW
zrk@w|Gwu}sJiP30p${oO)j4vad66lajh}euL>k>KhZorr)NR#E)8FD(JAdnL-6Ktb
zo7(aZyE1+f7bG-7;hSBPdxgTmwhD)7GU;mibY|r11zlgRfd;4fsYp0^j=VORx3ruz
z#b1s@)8f3(&{UC@BK2%1Cn?|IUqxmf?4@7CWp84;{nC43aebz{OX?*4x1`aGl#@$Z
zK3}Syf#>;0ebHty`9LU6Z-?os6zV|5WP0>^xnwk}YZ?KVAyn2_nc<^hV`<Na>BW7@
zCEaMp>@y6c`_MSJ)H7tKm_r=yT1!jl{RCT+BEBfFgw=GAzuWWmD6xDA2_}xtr*BCa
zyiA_u3k=v{d{)NMhosS(?laI}{Nui^Ci{+NqD5_OKHDC)VnD&-+`JQZ&Mg;6(5*Hq
zx~W`jFnAGbqwVD(TGy~y>{GD^WM9Fx-_UyTubkLdko|uCW$aqIl|58(60)x0pEDNw
z!-753Deo6ViMM4A7jcc?4M06xqFYFVPJV-oDCssee1nh2$B*CnzXR@_V0tI7W80)i
zNM<KIO&iUwe-Kxs)!f!Xy{?ZJ8@f@eKsR|r>gYQS=z9m~YXs<10w&4Kky#)^j}g#C
z0V*XRMS*r`DO5p(UM^EPP^oE+GMn<?NZ*S_krZcWCw^G^q$oD=>!cncPT8f(p?JvK
S=~g?`AyrjFYFrJdfqwyx`WXNK

delta 2911
zcmb7GO>7%Q6!!XO?WVSqtn*_hapE|?n<kJnDFT{?Bt=QvkhVYq!GT&PJ5eqC*SBj@
zkWi6|5O6?6BUNy!_>s7Apb|nt9FR~ED58e~Ldyk25fV2fF7yKL&2Hn(;+8hjeA)Tl
z%-i|Cc{ARBX1<x}n~X#n9{%h4`rq9i&#xZGUjUzHvFR7z>ig^*i=OvnQi~ofsx`ji
z(HdD7lh6Azy~s3a&B!!k-<L^aU(sUNkBNRC_FJ@8?6=~KAkOGVrcG-{rrpjlfJ|IV
zAd|3}L1a3#PGmZ5CO3psmzG2-X;Z_<bZb4x^w^AwOiJrTrq^ahkV$KO$n@FFK4ki}
z0b~YjW>k|N_o#!Hx22TCUv8e@<GwYigTL;ZM!e#i8|gw5pkp_5Qnwu;j!pL>guKws
zC;VS_69Wl?+8i;Q@}zhya82svzXyipK^il}Tjldo7k@{djql7f_X5-Mz&4DmQHBBj
zr`*$#{%=OpUn%RxARh@nIGdy}ZlMQy2*jGlcTW+^5i3byfX3>6gpfBRLkgFk;GYL8
zw_pAtz7$G5Q14wet+m%oVD^Lb8rz=<{y}K<@b1}W#9+lrA!o2`DOY3;&uV%0V~+Wq
zJQD1;7u(4zd$!w1WhSauD-7~w$XaQ}_+t(C%lj|{D!<ThXsYI|yqRYOO*ey^`GUbf
zhkI#MZT&lYwaBHtBX=xz3bQO=v&2d;B^LS8-jAh0J|3Q1pP{!rgkT2Q*^NR~W6(;}
z96=iaxunXlvr;%h>`{Va1h-n}D&G!&FAeecB8$>8|06P?OjD*tXr@^s1fzT`n#3VX
z(J_Ubgu^r<WWS5Q5lxL!b~9MX8R$s~R%y^l0+%u5c8>oLJ-FoB$6z+Al{d24|0zAP
zi1O+(LdfU$hQhG0v!53l-yc7K0aY@+mFH9mr~`|F0Xi>g0MbMWSA;*u_(s!x=g3{t
zmoFKhQkZ;(C4wk{%V^=IaQmhMG)UxiS^hKyZsq&)7}RO!JQ9yLkKS>mWN?N-b7={9
zZDbts1N@Wbk47vDU>)P=L?~a<ja+Gi!7>tXoZtk7ys*sQRC>>e?T%PG9igbGwP)x_
zh!Q3$)Ey;wlwg&>M=(zy>LK8$J(`$ls_G1~)rv;PbF&P^x?TjRCSK!{u}QZD6mS$!
z?L?o#z^mA9T5t+2nC3slwjvJckmlKzp=Ik3Qzn--amSH|s^772v0Fm6t8!`h+x%L~
z^>*hwhA6S+EC04tjgYY*QBrc(-*(`%aJR9pyD=I}o|<8u8QDrs*SE@`Sq`sIP}uwg
zJv~X_GJKC?-D&=ATYOloer;#wv-ITBL8e~fzqHNW-JPGqX&15Gyz_&Q6Lohf(a$fn
z|JXvN+>l09DI@2#Y&Kt7flYq3D{fU+7{oTvWn%h@xe8EqnE}00$QxF<i6b{ltgNvD
z!&}59*1bt)5Z_bC>qb3+pJF0CjNswvM88|<Q^><Di;H3OGB!&oUNOLIrN8x&$`?^!
z>ge&|8<L8rE3kE%0b9VkW(;E_`ooTHOLT*^>7veR*LQ%OH6RDGINFr0v*DKNI7mWe
zsan*{(3vWO7qCw19wJh61)D8;Eg9w~JL7jJynyq+pd8|7orD)`;XVB4&aZ}@;-QEG
zQFICat=QrhU=w>#rfs*%zODmMp;5C0X9!&T><|w?ah*UEcAZN8j-N>0^T_Vs61e^T
z(%pF#TTLc0>KKS~Hh=l+WJqFGQPLM0qzLF+1n5HorU(`YG6ZxL0UZvYx&iVKD4(M$
w#j@$Mzzj_n%UZR-X6WNs-_MWqbS1p9Pm!CFO+m%4G${RwqBJQ<C8|XK1)J0bWdHyG

diff --git a/db.sqlite3 b/db.sqlite3
index 364f2cf85cd3b58efc9840bd8b709ad186b6e1ea..537bf928bfff1c1580a8c3ba144992862b7d8d3b 100644
GIT binary patch
delta 317
zcmZoTz}s+ucY-wI)rm6Bj8_{IS`!$zCNLSw3z{n!8d(`wTA3K=8JZcH8JKNfB+rzz
zfP;zuFa!T1{=?gO4lr%!x07RbWHd4`w9qv))HMX_F#_r_(=#zOF)=e^l4W+}#E>>J
z*E2S;Fg7>k+RT{nUw%=6!ZZU$R(9SN2EIeQEt?e;DtI-TteIGSTUZ@S%(Al$QZfrN
zlPxl`3`z_$lZ{dg&9h9BQw)pB%8K%~zmj8SVU)tOy2+XmY{2vf`pgOtRdR4u2p2Fg
iFfj3NXW+lXzkRb{!fJk16=q*XLY6XZzoXBrVgLX~XjK*f

delta 182
zcmZoTz}s+ucY-wIiHS1Kj3*isS`!$zCNLSw3z{hyT3Q*KSQ#7XSsEFcnwf83B+rzz
zfP<0$5d#nzZ|6C{w4HzA26=f|W=BpV149d4LqlC-1DG~rJwppK6GKC;&5Q~E<rftw
zOln|ZW8^!;z;|e~qQVY7jwWkHR^Jv@$LSCBnH9Fbl4E9Jl)<8%fq{XM{|*EHoy~#?
Nm-x5e(PvgM002i4F<k%v

diff --git a/sandboxMP/__pycache__/settings.cpython-36.pyc b/sandboxMP/__pycache__/settings.cpython-36.pyc
index 81d3f737e40d974fadf967a30ccbe7134a8790b6..cf9d0a2442584a5b2d0c58f3584091cfc99a1693 100644
GIT binary patch
delta 198
zcmZn^{Vb|%%*)G_Gv$4BJwF4(V+JI^31m9}ak0xrWeY|@%P55u)+j|FR!U(CX3(_S
zoWS^zP4J}+P{~UXAd$I&g@Hj+d2=vFHe=K+p<vhGU{8O)cxQiqZ%@~FM|am-@-Q*i
zhyc$Zpjb$}Q;>gnuxn7fvyXqU>n$mmf?&rm*Lc@3*PzJwAlJZ9*Wi$q3`KfCON#U+
VALn#pteVWlRnEr7%EHLP2mp8AGD!dc

delta 83
zcmew?+9;}Q%*)Hwxa?i@KRyPA#|%h-6UcS|;$n-9$`*{QOu-DA=9_aEKe91tDs0Z<
a$Y$hR$xx&TR8XWj*_g|Tv1D=?S2+OhNfILf

diff --git a/sandboxMP/settings.py b/sandboxMP/settings.py
index 4c9b652..7520930 100644
--- a/sandboxMP/settings.py
+++ b/sandboxMP/settings.py
@@ -143,4 +143,10 @@ SAFE_URL = [r'^/$',
             '/media/',
             '/admin/',
             '/ckeditor/',
-            ]
\ No newline at end of file
+            ]
+
+# session timeout
+
+SESSION_COOKIE_AGE = 60 * 20
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+SESSION_SAVE_EVERY_REQUEST = True 
\ No newline at end of file