From dd9c401a1e304c18e85ca37f0388285f666c7da6 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Wed, 25 Nov 2015 22:02:12 +0800
Subject: [PATCH] routine update

---
 .../Controllers/RoleManagerController.cs      |  6 ------
 .../Controllers/UserManagerController.cs      |  6 ------
 OpenAuth.Mvc/Views/RoleManager/Index.cshtml   |  2 +-
 OpenAuth.Mvc/Views/UserManager/Index.cshtml   | 19 ++++++++++++++++++-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/OpenAuth.Mvc/Controllers/RoleManagerController.cs b/OpenAuth.Mvc/Controllers/RoleManagerController.cs
index 15848620..e8af4734 100644
--- a/OpenAuth.Mvc/Controllers/RoleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/RoleManagerController.cs
@@ -53,12 +53,6 @@ namespace OpenAuth.Mvc.Controllers
             return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize));
         }
 
-        //获取组织下面用户个数
-        public int GetCount(int orgId)
-        {
-            return _app.GetRoleCntInOrg(orgId);
-        }
-
         public string Delete(string Id)
         {
             try
diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs
index de02cb26..6bbe732d 100644
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@@ -52,12 +52,6 @@ namespace OpenAuth.Mvc.Controllers
             return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize));
         }
 
-        //获取组织下面用户个数
-        public int GetCount(int orgId)
-        {
-            return _app.GetUserCntInOrg(orgId);
-        }
-
         public string Delete(string Id)
         {
             try
diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 545308c7..50fd825a 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -84,7 +84,7 @@
                }   
             ],
             dataUrl: 'RoleManager/Load?orgId=' + selectedId,
-            delUrl: 'Role/Delete',
+            delUrl: 'RoleManager/Delete',
             delPK: "Id",
             fullGrid: true,
             showLinenumber: true,
diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
index 1e04f365..ce86d543 100644
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -37,7 +37,8 @@
             toolbarItem: 'refresh, |, del',
             toolbarCustom: '<a href="/UserManager/Add" class="btn btn-green" data-icon ="plus"  ' +
                 'data-toggle="dialog" data-id="dialog-mask" data-mask="true" data-on-close="refreshGrid">添加</a>' +
-                '<button class=" btn-green" onclick="editOrg()" data-icon="pencil" type="button">编辑</button>',
+                '<button class=" btn-green" onclick="editOrg()" data-icon="pencil" type="button">编辑</button>'+
+                 '<button class=" btn-green" onclick="accessMenu()" data-icon="pencil" type="button">用户菜单授权</button>',
             columns: [
                 {
                     name: 'Id',
@@ -173,6 +174,22 @@
 
     }
 
+    //自定义的编辑按钮
+    function accessMenu() {
+        var selected = getSelected(2);
+        if (selected == null) return;
+
+        $(this).dialog({
+            id: 'editDialog',
+            url: '/UserManager/Add?id=' + selected,
+            title: '编辑',
+            onClose: function () {
+                refreshGrid();
+            }
+        });
+
+    }
+
     function refreshGrid() {
         $('#@_gridId').datagrid('refresh');
        // loadDataGrid();