From e388337043f41ccf1818ea660534a0afe24f9055 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Fri, 18 Nov 2016 12:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=8C=87=E6=B4=BE=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=90=8E=E5=85=88=E5=87=BA=E7=8E=B0swal=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/js/framework.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Bootstrap.Admin/Content/js/framework.js b/Bootstrap.Admin/Content/js/framework.js
index 9524289b..f724c061 100644
--- a/Bootstrap.Admin/Content/js/framework.js
+++ b/Bootstrap.Admin/Content/js/framework.js
@@ -303,13 +303,13 @@
         }
     };
     Role.getRolesByUserId = function (userId, callback) {
-        processData.call(this, { Id: userId, callback: callback, data: { type: "user" } });
+        processData.call(this, { Id: userId, callback: callback, data: { type: "user" }, swal: false });
     };
     Role.getRolesByGroupId = function (groupId, callback) {
-        processData.call(this, { Id: groupId, callback: callback, data: { type: "group" } });
+        processData.call(this, { Id: groupId, callback: callback, data: { type: "group" }, swal: false });
     };
     Role.getRolesByMenuId = function (menuId, callback) {
-        processData.call(this, { Id: menuId, callback: callback, data: { type: "menu" } });
+        processData.call(this, { Id: menuId, callback: callback, data: { type: "menu" }, swal: false });
     };
     Role.saveRolesByUserId = function (userId, roleIds, callback) {
         processData.call(this, { Id: userId, callback: callback, method: "PUT", data: { type: "user", roleIds: roleIds } });
@@ -331,13 +331,13 @@
         }
     };
     User.getUsersByRoleId = function (roleId, callback) {
-        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" } });
+        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" }, swal: false });
     };
     User.saveUsersByRoleId = function (roleId, userIds, callback) {
         processData.call(this, { Id: roleId, callback: callback, method: "PUT", data: { type: "role", userIds: userIds } });
     };
     User.getUsersByGroupeId = function (groupId, callback) {
-        processData.call(this, { Id: groupId, callback: callback, data: { type: "group" } });
+        processData.call(this, { Id: groupId, callback: callback, data: { type: "group" }, swal: false });
     };
     User.saveUsersByGroupId = function (groupId, userIds, callback) {
         processData.call(this, { Id: groupId, callback: callback, method: "PUT", data: { type: "group", userIds: userIds } });
@@ -362,13 +362,13 @@
         }
     };
     Group.getGroupsByUserId = function (userId, callback) {
-        processData.call(this, { Id: userId, callback: callback, data: { type: "user" } });
+        processData.call(this, { Id: userId, callback: callback, data: { type: "user" }, swal: false });
     };
     Group.saveGroupsByUserId = function (userId, groupIds, callback) {
         processData.call(this, { Id: userId, callback: callback, method: "PUT", data: { type: "user", groupIds: groupIds } });
     };
     Group.getGroupsByRoleId = function (roleId, callback) {
-        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" } });
+        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" }, swal: false });
     };
     Group.saveGroupsByRoleId = function (roleId, groupIds, callback) {
         processData.call(this, { Id: roleId, callback: callback, method: "PUT", data: { type: "role", groupIds: groupIds } });
@@ -399,10 +399,10 @@
         return html;
     };
     Menu.getMenus = function (callback) {
-        processData.call(this, { Id: 0, callback: callback, data: { type: "user" } });
+        processData.call(this, { Id: 0, callback: callback, data: { type: "user" }, swal: false });
     };
     Menu.getMenusByRoleId = function (roleId, callback) {
-        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" }, html: null });
+        processData.call(this, { Id: roleId, callback: callback, data: { type: "role" }, swal: false, html: null });
     };
     Menu.saveMenusByRoleId = function (roleId, menuIds, callback) {
         processData.call(this, { Id: roleId, callback: callback, method: "PUT", data: { type: "role", menuIds: menuIds } });