From 88c6fb144f47c33503828793bf63b2ca31965699 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Tue, 1 Dec 2015 22:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E9=A1=B5=E6=8C=89?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B4=A6=E5=8F=B7=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ModuleManagerApp.cs              |  5 ----
 OpenAuth.App/UserManagerApp.cs                |  1 +
 .../Controllers/ModuleManagerController.cs    | 18 -------------
 OpenAuth.Mvc/Views/Home/Index.cshtml          | 25 +++++++++++--------
 OpenAuth.Mvc/Views/ModuleManager/Add.cshtml   |  3 +--
 OpenAuth.Mvc/Views/ModuleManager/Index.cshtml |  2 +-
 6 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/OpenAuth.App/ModuleManagerApp.cs b/OpenAuth.App/ModuleManagerApp.cs
index df19d344..e81c8166 100644
--- a/OpenAuth.App/ModuleManagerApp.cs
+++ b/OpenAuth.App/ModuleManagerApp.cs
@@ -54,11 +54,6 @@ namespace OpenAuth.App
             return _repository.Find(null).ToList();
         }
 
-        public List<Module> LoadForNav()
-        {
-            return _repository.Find(u => u.ParentId == 0).ToList();
-        }
-
         /// <summary>
         /// 以组合的方式显示所有的模块信息
         /// </summary>
diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs
index 5f67b664..894d165f 100644
--- a/OpenAuth.App/UserManagerApp.cs
+++ b/OpenAuth.App/UserManagerApp.cs
@@ -107,6 +107,7 @@ namespace OpenAuth.App
             if (user.Id == 0)
             {
                 user.CreateTime = DateTime.Now;
+                user.Password = user.Account; //初始密码与账号相同
                 _repository.Add(user);
             }
             else
diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
index cc2f0bd1..f913dbea 100644
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@@ -62,24 +62,6 @@ namespace OpenAuth.Mvc.Controllers
             return JsonHelper.Instance.Serialize(orgs);
         }
 
-        /// <summary>
-        /// 加载首页导航模块
-        /// </summary>
-        /// <returns>System.String.</returns>
-        public string LoadForNav()
-        {
-            var orgs = _app.LoadForNav();
-            //添加根节点
-            orgs.Add(new Module
-            {
-                Id = 0,
-                ParentId = -1,
-                Name = "根节点",
-                CascadeId = "0"
-            });
-            return JsonHelper.Instance.Serialize(orgs);
-        }
-
         public string LoadForUser(int userId)
         {
             var orgs = _app.LoadForUser(userId);
diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml
index 5bade585..d92c5955 100644
--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@@ -18,7 +18,7 @@
     <link href="~/BJUI/plugins/niceValidator/jquery.validator.css" rel="stylesheet">
     <link href="~/BJUI/plugins/bootstrapSelect/bootstrap-select.css" rel="stylesheet">
     <link href="~/BJUI/themes/css/FA/css/font-awesome.min.css" rel="stylesheet">
-    <link href="~/BJUI/plugins/styles/zTreeStyle/zTreeStyle.css"/>
+    <link href="~/BJUI/plugins/styles/zTreeStyle/zTreeStyle.css" />
     <!--[if lte IE 7]>
     <link href="~/BJUI/themes/css/ie7.css" rel="stylesheet">
     <![endif]-->
@@ -202,15 +202,20 @@
 
                                     @foreach (var module in Model)
                                     {
-                                        <li data-id="@module.Id" data-pid="0" data-faicon="folder-open-o" data-faicon-close="folder-o">@module.Name</li>
-
-                                        @*foreach (var child in module.Childern)
-                                        {
-                                            <li data-id="@child.Id" data-pid="@child.ParentId"
-                                                data-faicon="caret-right"
-                                                data-url="@child.Url" data-tabid="@child.Id">@child.Name</li>
-                                        }*@
-
+                                        
+                                        <li data-id="@module.Id" data-pid="@module.ParentId"
+                                            @if (string.IsNullOrWhiteSpace(module.Url.Trim()))
+                                            {
+                                                @:data - faicon = "folder-open-o"
+                                                @:data - faicon - close = "folder-o"
+                                            }
+                                            else
+                                            {
+                                                @:data-faicon="caret-right"
+                                                @:data-url="@module.Url"
+                                                @:data-tabid="@module.Id"
+                                            }
+                                            >@module.Name</li>
                                     }
                                 </ul>
                             </div>
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
index b7b6d704..814903e8 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
@@ -25,8 +25,7 @@
                 <tr>
                     <td>
                         <label for="Url" class="control-label x120">主页面URL：</label>
-                        <input type="text" name="Url" id="Url" value="@Model.Url"
-                               data-rule="required" size="20">
+                        <input type="text" name="Url" id="Url" value="@Model.Url"  size="20">
                     </td>
                 </tr>
                 <tr>
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
index 68094bf0..f5a72b24 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@@ -133,7 +133,7 @@
             },
             callback: {onClick: zTreeOnClick}
         };
-        $.getJSON('ModuleManager/LoadForNav', function (json) {
+        $.getJSON('ModuleManager/LoadForTree', function (json) {
             var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
             zTreeObj.expandAll(true);
         });