diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index ab4c646..b9119e5 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -181,8 +181,8 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim } $scope.editTag = function(tag) { - if (tag.name == "未分类") { - toastr.warning('这个是系统默认分类,暂时不允许更新!', "警告"); + if (tag.name == "未分类" || tag.name == "收藏") { + toastr.warning('这个是系统默认分类,暂时不允许更新名字!', "警告"); return; } tag.oldName = tag.name; @@ -227,7 +227,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim $scope.confirmDelTag = function(tagId, tagName) { ngDialog.close(dialog); var params = { - del: tagName == '未分类' ? false : true, + del: (tagName == '未分类' || tag.name == "收藏") ? false : true, id: tagId, } bookmarkService.delTag(params) diff --git a/public/views/dialog-del-tag.html b/public/views/dialog-del-tag.html index 42a78fd..7161477 100644 --- a/public/views/dialog-del-tag.html +++ b/public/views/dialog-del-tag.html @@ -6,6 +6,8 @@

如果删除该分类,那么该分类下的所有书签都会删掉哦!数据无价,谨慎操作!且删且珍惜!

未分类为系统默认分类,只允许删除该分类下面的书签,不允许删除该分类信息

+

+ 收藏为系统默认分类,只允许删除该分类下面的书签,不允许删除该分类信息