diff --git a/database/db.js b/database/db.js index a391f02..d6df30a 100644 --- a/database/db.js +++ b/database/db.js @@ -152,8 +152,8 @@ db.updateLastUseTags = function(user_id, tags) { }); } -db.clickBookmark = function(id) { - var sql = "UPDATE `bookmarks` SET `click_count`=`click_count`+1, `last_click`=now() WHERE (`id`='" + id + "')"; +db.clickBookmark = function(id, user_id) { + var sql = "UPDATE `bookmarks` SET `click_count`=`click_count`+1, `last_click`=now() WHERE (`id`='" + id + "') AND (`user_id`='" + user_id + "')"; return new Promise(function(resolve, reject) { client.query(sql, (err, result) => { if (err) { diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index 72ca12e..36c6723 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -46,7 +46,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi $scope.jumpToUrl = function(url, id) { if (!$scope.edit) { - $window.open(url, '_blank'); + $window.open(url); bookmarkService.clickBookmark({ id: id }); diff --git a/routes/api.js b/routes/api.js index ce7f34b..7686251 100644 --- a/routes/api.js +++ b/routes/api.js @@ -14,7 +14,7 @@ api.post('/logout', function(req, res) { }); api.post('/clickBookmark', function(req, res) { - db.clickBookmark(req.body.params.id) + db.clickBookmark(req.body.params.id, req.session.userId) .then((affectedRows) => res.json({})) .catch((err) => console.log('clickBookmark error', err)); });