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] 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
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

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
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

delta 4377
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
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 () {