liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新全站点击的书签不出发数据库点击动作

This commit is contained in:
luchenqun 2018-02-28 20:33:06 +08:00
parent 289c286861
commit e125f06665
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
database/db.js
View File

@ -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 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; var sql = sql1 + " UNION " + sql2 + " UNION " + sql3;
console.log(sql);
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => { client.query(sql, (err, result) => {
if (err) { if (err) {

4
public/scripts/controllers/tags-controller.js
View File

@ -77,6 +77,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
} }
}) })
} }
$timeout(function() { $timeout(function() {
timeagoInstance.cancel(); timeagoInstance.cancel();
timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); 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.loadBookmarks = true;
} }
$scope.costomTag.bookmarkClicked = false; $scope.costomTag.bookmarkClicked = false;
$scope.costomAllUsersTag.bookmarkClicked = false;
perPageItems = ($scope.showMode == 'item') ? 50 : 20; perPageItems = ($scope.showMode == 'item') ? 50 : 20;
@ -583,7 +585,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
if (click1 > click2) { if (click1 > click2) {
return -1; return -1;
} else if (click1 == click2) { } else if (click1 == click2) {
return a.created_at >= b.created_at ? -1 : 1; return a.url > b.url ? -1 : 1;
} else { } else {
return 1; return 1;
} }

3
routes/api.js
View File

@ -48,7 +48,8 @@ api.post('/logout', function(req, res) {
api.post('/clickBookmark', function(req, res) { api.post('/clickBookmark', function(req, res) {
console.log("clickBookmark username = ", req.session.username); 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({})) .then((affectedRows) => res.json({}))
.catch((err) => console.log('clickBookmark error', err)); .catch((err) => console.log('clickBookmark error', err));
}); });