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

更新一下当插入书签书签存在是，插入成功做个提示

This commit is contained in:
luchenqun 2017-03-30 11:06:00 +08:00
parent 3e40fe1ba9
commit 6cfd37a60b
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'bookmar
if (/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(newUrl)) {
var params = {
url: newUrl,
requestId: 0,
}
bookmarkService.getArticle(params)
.then((data) => $scope.title = data.title)
@ -113,8 +114,9 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'bookmar
.then((data) => {
$('.ui.modal.js-add-bookmark').modal('hide');
pubSubService.publish('EditCtr.inserBookmarsSuccess', data);
console.log(JSON.stringify(data));
if (data.title) {
toastr.success('[ ' + data.title + ' ] 添加成功，将自动重新更新书签！', "提示");
toastr.success('[ ' + data.title + ' ] 添加成功，将自动重新更新书签！</br>' + (data.update ? '系统检测到该书签之前添加过，只更新链接，描述，标题，分类。创建日期与最后点击日期不更新！' : ''), "提示");
} else {
toastr.error('[ ' + params.title + ' ] 添加失败', "提示");
}

23
routes/api.js
View File

@ -731,10 +731,18 @@ api.post('/addBookmark', function(req, res) {
var tags = bookmark.tags;
var bookmarkId = -1;
var ret = {};
var update = false;
db.getBookmarkbyUrl(userId, bookmark.url)
.then((bookmarkId) => {
// 如果这个url的书签存在了，那么直接返回书签，否则返回插入的书签
return bookmarkId ? Promise.resolve(bookmarkId) : db.addBookmark(userId, bookmark);
if(bookmarkId){
bookmark.id = bookmarkId;
db.updateBookmark(bookmark); // 如果存在，更新一下。
update = true;
return Promise.resolve(bookmarkId);
} else {
return db.addBookmark(userId, bookmark);
}
})
.then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
@ -750,6 +758,7 @@ api.post('/addBookmark', function(req, res) {
})
.then((bookmarkTags) => {
ret.tags = bookmarkTags;
ret.update = update;
res.json(ret)
})
.catch((err) => console.log('addBookmark err', err)); // oops!
@ -765,11 +774,18 @@ api.post('/favoriteBookmark', function(req, res) {
var userId = req.session.user.id;
var bookmarkId = -1;
var ret = {};
var update = false;
db.getBookmarkbyUrl(userId, bookmark.url)
.then((bookmarkId) => {
// 如果这个url的书签存在了，那么直接返回书签，否则返回插入的书签
return bookmarkId ? Promise.resolve(bookmarkId) : db.addBookmark(userId, bookmark);
if(bookmarkId){
bookmark.id = bookmarkId;
db.updateBookmark(bookmark); // 如果存在，更新一下。
update = true;
return Promise.resolve(bookmarkId);
} else {
return db.addBookmark(userId, bookmark);
}
})
.then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
@ -798,6 +814,7 @@ api.post('/favoriteBookmark', function(req, res) {
})
.then((bookmarkTags) => {
ret.tags = bookmarkTags;
ret.update = update;
res.json(ret)
})
.catch((err) => console.log('addBookmark err', err)); // oops!