From e125f06665bdd8501952a2a84f8c725ddaed861b Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Wed, 28 Feb 2018 20:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=A8=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=9A=84=E4=B9=A6=E7=AD=BE=E4=B8=8D=E5=87=BA=E5=8F=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=82=B9=E5=87=BB=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js                                | 1 +
 public/scripts/controllers/tags-controller.js | 4 +++-
 routes/api.js                                 | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/database/db.js b/database/db.js
index 37de3ba..78f3d84 100644
--- a/database/db.js
+++ b/database/db.js
@@ -635,6 +635,7 @@ db.getBookmarksCostomAllUsersTag = function(user_id, perPageItems) {
     var sql3 = "(SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at,  DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE `user_id` != '" + user_id + "' ORDER BY `last_click` DESC LIMIT 0, " + perPageItems + ")";
 
     var sql = sql1 + " UNION " + sql2 + " UNION " + sql3;
+    console.log(sql);
     return new Promise(function(resolve, reject) {
         client.query(sql, (err, result) => {
             if (err) {
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 3ae6264..dcd8dfa 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -77,6 +77,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
                 }
             })
         }
+
         $timeout(function() {
             timeagoInstance.cancel();
             timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN');
@@ -92,6 +93,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
             $scope.loadBookmarks = true;
         }
         $scope.costomTag.bookmarkClicked = false;
+        $scope.costomAllUsersTag.bookmarkClicked = false;
 
         perPageItems = ($scope.showMode == 'item') ? 50 : 20;
 
@@ -583,7 +585,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
         if (click1 > click2) {
             return -1;
         } else if (click1 == click2) {
-            return a.created_at >= b.created_at ? -1 : 1;
+            return a.url > b.url ? -1 : 1;
         } else {
             return 1;
         }
diff --git a/routes/api.js b/routes/api.js
index b58e328..407ffb0 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -48,7 +48,8 @@ api.post('/logout', function(req, res) {
 
 api.post('/clickBookmark', function(req, res) {
     console.log("clickBookmark username = ", req.session.username);
-    db.clickBookmark(req.body.params.id, req.session.userId)
+    db.getUser(req.session.username)
+        .then((user) => { return user.id == req.session.userId ? db.clickBookmark(req.body.params.id, req.session.userId) : Promise.resolve(0); })
         .then((affectedRows) => res.json({}))
         .catch((err) => console.log('clickBookmark error', err));
 });