diff --git a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
index 7bb08c39..f95172df 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
@@ -28,8 +28,8 @@
@@ -38,20 +38,28 @@
-
-
+
+
+ |
+
+
+
+
+ |
+
+
|
-
-
-
-
+
+
+
|
@@ -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);
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 @@
@@ -51,8 +51,8 @@