From d4482a2a726ecacd6c3fcff809e2d48bd3e0e87d Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 25 Nov 2015 23:29:00 +0800 Subject: [PATCH] RoutineUpdate --- .../Controllers/ModuleManagerController.cs | 15 ++-- OpenAuth.Mvc/OpenAuth.Mvc.csproj | 1 + .../Views/ModuleManager/LookupMulti.cshtml | 86 +++++++++++++++++++ OpenAuth.Mvc/Views/UserManager/Index.cshtml | 6 +- 4 files changed, 99 insertions(+), 9 deletions(-) create mode 100644 OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index d45c4e9e..a356dec8 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -1,9 +1,8 @@ - -using System; -using System.Web.Mvc; using Infrastructure; using OpenAuth.App; using OpenAuth.Domain; +using System; +using System.Web.Mvc; namespace OpenAuth.Mvc.Controllers { @@ -23,6 +22,12 @@ namespace OpenAuth.Mvc.Controllers return View(); } + //用于选择模块时使用 + public ActionResult LookUpMulti() + { + return View(); + } + /// /// 加载模块下面的所有模块 /// @@ -34,7 +39,7 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载tree结构 /// - public string LoadForTree(bool bAll=false) + public string LoadForTree(bool bAll = false) { var orgs = _app.LoadForTree(bAll); //添加根节点 @@ -48,7 +53,6 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(orgs); } - public ActionResult Add(int id = 0) { return View(_app.Find(id)); @@ -61,7 +65,6 @@ namespace OpenAuth.Mvc.Controllers try { _app.AddOrUpdate(model); - } catch (Exception ex) { diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index acd4c075..2a82ef70 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -617,6 +617,7 @@ + diff --git a/OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml b/OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml new file mode 100644 index 00000000..ce8136b9 --- /dev/null +++ b/OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml @@ -0,0 +1,86 @@ +@model dynamic + +@{ + ViewBag.Title = "title"; + Layout = null; +} +
+
+
    +
    +
    + + + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index ce86d543..e36937e6 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -174,14 +174,14 @@ } - //自定义的编辑按钮 + //授权按钮 function accessMenu() { var selected = getSelected(2); if (selected == null) return; $(this).dialog({ - id: 'editDialog', - url: '/UserManager/Add?id=' + selected, + id: 'accessMenuDialog', + url: '/ModuleManager/LookupMulti?id=' + selected, title: '编辑', onClose: function () { refreshGrid();