From 19c882e98fb035314ba4000a850ea1344ec89d96 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 27 Feb 2017 13:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E7=B1=BB=E7=9A=84=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js                   | 13 +++++++++++++
 public/views/dialog-del-tag.html |  2 +-
 routes/api.js                    |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/database/db.js b/database/db.js
index b01bf4c..a0408fd 100644
--- a/database/db.js
+++ b/database/db.js
@@ -205,6 +205,19 @@ db.delBookmarks = function(bookmarkIds) {
     });
 }
 
+db.delTagsBookmarks = function(bookmarkIds) {
+    var sql = "DELETE FROM `tags_bookmarks` WHERE bookmark_id IN (" + (bookmarkIds.toString() || ("-1")) + ")";
+    return new Promise(function(resolve, reject) {
+        client.query(sql, (err, result) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(result.affectedRows);
+            }
+        });
+    });
+}
+
 db.addTagsBookmarks = function(tags, bookmard_id) {
     sql = "INSERT INTO `tags_bookmarks` (`tag_id`, `bookmark_id`) VALUES";
     for (var i = 0; i < tags.length; i++) {
diff --git a/public/views/dialog-del-tag.html b/public/views/dialog-del-tag.html
index e5b6e7c..11563bc 100644
--- a/public/views/dialog-del-tag.html
+++ b/public/views/dialog-del-tag.html
@@ -3,7 +3,7 @@
     <p ng-show="ngDialogId">您确认要删除分类:
         <code>{{ waitDelTag.name }}</code>吗？
     </p>
-    <p>如果删除该分类，那么该分类下的所有书签都会删掉哦！</p>
+    <p>如果删除该分类，那么该分类下的所有书签都会删掉哦！数据无价，谨慎操作！</p>
     <p ng-show="waitDelTag.name == '未分类'">
         <code>未分类</code>为系统默认分类，只允许删除该分类下面的书签，不允许删除该分类信息</p>
 </div>
diff --git a/routes/api.js b/routes/api.js
index 810545c..f0d17d1 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -722,6 +722,7 @@ api.post('/delTag', function(req, res) {
             return db.delTagBookmarks(tag.id); // 先删掉分类跟书签的映射
         })
         .then((affectedRows) => db.delBookmarks(bookmarksId)) // 再删掉该分类下面的书签
+        .then((affectedRows) => db.delTagsBookmarks(bookmarksId)) // 再删掉该书签关联的其他分类
         .then((affectedRows) => {
             if (needDelTag) {
                 return db.delTag(tag.id);