From b5a910c6804fb605c629efcc72735f75f805696d Mon Sep 17 00:00:00 2001
From: "liuchun_0206@163.com" <liuchun_0206@163.com>
Date: Tue, 15 Nov 2016 12:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AFBug:?=
 =?UTF-8?q?=E7=AB=99=E5=86=85=E6=B6=88=E6=81=AF=E5=8F=AF=E4=BB=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Scripts/Menus.js      | 10 ++--------
 Bootstrap.DataAccess/MessageHelper.cs |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Bootstrap.Admin/Scripts/Menus.js b/Bootstrap.Admin/Scripts/Menus.js
index 706967c7..0ac11f15 100644
--- a/Bootstrap.Admin/Scripts/Menus.js
+++ b/Bootstrap.Admin/Scripts/Menus.js
@@ -134,12 +134,6 @@
         $nestMenuInput.find('label:last').find('input').show();
         $nestMenu.find('li.dd-item').hide().remove('[data-id="0"]');
         $nestMenu.find('li[data-category="' + $('#category').selectpicker('val') + '"]').show();
-        var pid = $parentMenuID.val();
-        if (pid != "") {
-            // set active class
-            var radio = $nestMenuInput.find('input[value=' + pid + ']').filter(':radio');
-            radio.next('span').addClass('active');
-        }
         $dialogMenu.show().adjustDialog();
     });
 
@@ -154,8 +148,8 @@
         var type = $(this).data('type');
         switch (type) {
             case "parent":
-                $parentMenuID.val($nestMenuInput.find('input').filter(':radio:checked').val());
-                $parentMenuName.val($nestMenuInput.find('input').filter(':radio:checked').next('span').text());
+                $('#parentId').val($('.dd3-content :radio:checked').val());
+                $('#parentName').val($('.dd3-content :radio:checked').next('span').text());
                 break;
             case "order":
                 var data = $('#nestable_menu').nestable('serialize');
diff --git a/Bootstrap.DataAccess/MessageHelper.cs b/Bootstrap.DataAccess/MessageHelper.cs
index 25d2df85..c50f79fb 100644
--- a/Bootstrap.DataAccess/MessageHelper.cs
+++ b/Bootstrap.DataAccess/MessageHelper.cs
@@ -88,7 +88,7 @@ namespace Bootstrap.DataAccess
         public static IEnumerable<Message> Trash(string userName)
         {
             var messageRet = RetrieveMessages(userName);
-            return messageRet.Where(n => n.Trash==1).Select(n => n);
+            return messageRet.Where(n => n.IsDelete==1).Select(n => n);
         }
         /// <summary>
         /// 标旗