更新了一下删除分类的规则

This commit is contained in:
luchenqun 2017-02-27 13:53:19 +08:00
parent 71f09cc1a7
commit 19c882e98f
3 changed files with 15 additions and 1 deletions

View File

@ -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) { db.addTagsBookmarks = function(tags, bookmard_id) {
sql = "INSERT INTO `tags_bookmarks` (`tag_id`, `bookmark_id`) VALUES"; sql = "INSERT INTO `tags_bookmarks` (`tag_id`, `bookmark_id`) VALUES";
for (var i = 0; i < tags.length; i++) { for (var i = 0; i < tags.length; i++) {

View File

@ -3,7 +3,7 @@
<p ng-show="ngDialogId">您确认要删除分类: <p ng-show="ngDialogId">您确认要删除分类:
<code>{{ waitDelTag.name }}</code>吗? <code>{{ waitDelTag.name }}</code>吗?
</p> </p>
<p>如果删除该分类,那么该分类下的所有书签都会删掉哦!</p> <p>如果删除该分类,那么该分类下的所有书签都会删掉哦!数据无价,谨慎操作!</p>
<p ng-show="waitDelTag.name == '未分类'"> <p ng-show="waitDelTag.name == '未分类'">
<code>未分类</code>为系统默认分类,只允许删除该分类下面的书签,不允许删除该分类信息</p> <code>未分类</code>为系统默认分类,只允许删除该分类下面的书签,不允许删除该分类信息</p>
</div> </div>

View File

@ -722,6 +722,7 @@ api.post('/delTag', function(req, res) {
return db.delTagBookmarks(tag.id); // 先删掉分类跟书签的映射 return db.delTagBookmarks(tag.id); // 先删掉分类跟书签的映射
}) })
.then((affectedRows) => db.delBookmarks(bookmarksId)) // 再删掉该分类下面的书签 .then((affectedRows) => db.delBookmarks(bookmarksId)) // 再删掉该分类下面的书签
.then((affectedRows) => db.delTagsBookmarks(bookmarksId)) // 再删掉该书签关联的其他分类
.then((affectedRows) => { .then((affectedRows) => {
if (needDelTag) { if (needDelTag) {
return db.delTag(tag.id); return db.delTag(tag.id);