From f39fad9bdcad9f5b619fb9a1b5b725090e9d2255 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Fri, 20 Nov 2015 16:45:53 +0800
Subject: [PATCH 1/2] Routine Update

---
 OpenAuth.Mvc/Views/RoleManager/Add.cshtml   | 8 ++++----
 OpenAuth.Mvc/Views/RoleManager/Index.cshtml | 4 ++--
 OpenAuth.Mvc/Views/UserManager/Add.cshtml   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
index 7bb08c39..7a4bcc1e 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
@@ -28,8 +28,8 @@
 
                         <label for="Status" class="control-label x90">当前状态：</label>
                         <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">正常</option>
-                            <option value="1">禁用</option>
+                            <option value="0" @if (Model.Status == 0) { <text> selected="selected" </text>   }>正常</option>
+                            <option value="1" @if (Model.Status == 1) { <text> selected="selected" </text>   }>禁用</option>
                         </select>
                     </td>
                 </tr>
@@ -38,8 +38,8 @@
 
                         <label for="Type" class="control-label x90">角色类型：</label>
                         <select name="Type" id="Type" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">管理员</option>
-                            <option value="1">普通用户</option>
+                            <option value="0" @if (Model.Type == 0) { <text> selected="selected" </text>  }>管理员</option>
+                            <option value="1" @if (Model.Type == 1) { <text> selected="selected" </text>   }>普通角色</option>
                         </select>
                     </td>
                 </tr>
diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 28d5f0fa..545308c7 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -53,7 +53,7 @@
                     label: '当前状态',
                     type: 'select',
                     align: 'center',
-                   items:[{'0':'正常'}],
+                   items:[{'0':'正常','1':'禁用'}],
                    width:50
                },    
                {
@@ -61,7 +61,7 @@
                     label: '角色类型',
                     type: 'select',
                     align: 'center',
-                    items: [{ '0': '管理员' }],
+                    items: [{ '0': '管理员','1':'普通角色' }],
                    width:50
                },    
                {
diff --git a/OpenAuth.Mvc/Views/UserManager/Add.cshtml b/OpenAuth.Mvc/Views/UserManager/Add.cshtml
index 69d3b017..6e049f24 100644
--- a/OpenAuth.Mvc/Views/UserManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Add.cshtml
@@ -41,8 +41,8 @@
                         <label for="Status" class="control-label x85">设置状态：</label>
 
                         <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">正常</option>
-                            <option value="1">禁用</option>
+                            <option value="0" @if (Model.Status == 0) { <text> selected="selected" </text>    }>正常</option>
+                            <option value="1" @if (Model.Status == 1) { <text> selected="selected" </text>    }>禁用</option>
                         </select>
                     </td>
                 </tr>
@@ -51,8 +51,8 @@
                         <label for="Sex" class="control-label x85">性别：</label>
 
                         <select name="Sex" id="Sex" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">男</option>
-                            <option value="1">女</option>
+                            <option value="0" @if (Model.Status == 0) { <text> selected="selected" </text>     }>男</option>
+                            <option value="1" @if (Model.Status == 1) { <text> selected="selected" </text>     }>女</option>
                         </select>
                     </td>
                 </tr>

From 6da19298910388e64a90e387982025726f37f737 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Fri, 20 Nov 2015 17:57:14 +0800
Subject: [PATCH 2/2] Routine update

---
 OpenAuth.Mvc/Views/RoleManager/Add.cshtml | 27 ++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
index 7a4bcc1e..f95172df 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
@@ -44,14 +44,22 @@
                     </td>
                 </tr>
 
-             
-                <tr>
+
+            <tr>
+                <td>
+                    <label for="OrgName" class="control-label x90">所属机构：</label>
+                    <input id="OrgId" name="OrgId" value="" style="display: none"/>
+                    <input type="text" name="OrgName" id="OrgName"
+                           data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.OrgName">
+                    <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
+                </td>
+            </tr>
+                 <tr>
                     <td>
-                        <label for="OrgName" class="control-label x90">所属机构：</label>
-                        <input id="OrgId" name="OrgId" value="" style="display: none" />
-                        <input type="text" name="OrgName" id="OrgName"
-                               data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.OrgName">
-                        <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
+
+                        <label for="OrgCascadeId" class="control-label x90">机构级联ID：</label>
+                        <input type="text" name="OrgCascadeId" id="OrgCascadeId" value="@Model.OrgCascadeId"
+                               data-rule="required" size="20">
                     </td>
                 </tr>
             </tbody>
@@ -105,20 +113,23 @@
     function zTreeCheck(e, treeId, treeNode) {
         var zTree = $.fn.zTree.getZTreeObj(treeId),
             nodes = zTree.getCheckedNodes(true);
-        var ids = '', names = '';
+        var ids = '', names = '', cascadeids='';
         for (var i = 0; i < nodes.length; i++) {
             ids += ',' + nodes[i].Id;
             names += ',' + nodes[i].Name;
+            cascadeids += ',' + nodes[i].CascadeId;
         }
         if (ids.length > 0) {  //去掉第一个逗号
             ids = ids.substr(1);
             names = names.substr(1);
+            cascadeids = cascadeids.substr(1);
         }
 
         var $from = $('#' + treeId).data('fromObj');
         if ($from && $from.length) $from.val(names);
 
         $('#OrgId').val(ids);
+        $('#OrgCascadeId').val(cascadeids);
     }
     function zTreeOnClick(event, treeId, treeNode) {
         var zTree = $.fn.zTree.getZTreeObj(treeId);