From 322a8733b61fa9a6a4917a3b8edb827eeb8add7d Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Sun, 5 Mar 2017 18:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/tags-controller.js | 6 +++---
 public/views/dialog-del-tag.html              | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

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 @@
     <p>如果删除该分类，那么该分类下的所有书签都会删掉哦！数据无价，谨慎操作！且删且珍惜！</p>
     <p ng-show="waitDelTag.name == '未分类'">
         <code>未分类</code>为系统默认分类，只允许删除该分类下面的书签，不允许删除该分类信息</p>
+    <p ng-show="waitDelTag.name == '收藏'">
+        <code>收藏</code>为系统默认分类，只允许删除该分类下面的书签，不允许删除该分类信息</p>
 </div>
 <div class="ngdialog-buttons">
     <button type="button" class="ngdialog-button ngdialog-button-primary" ng-click="confirmDelTag(waitDelTag.id, waitDelTag.name)">确定删除</button>