Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change logic of timestamp "update_time" #1892

Merged
merged 9 commits into from
Dec 9, 2018
Merged

change logic of timestamp "update_time" #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7385667
fixed bug in model.load's sample
eerenyuan Sep 13, 2018
2c0a497
typo in doc
eerenyuan Sep 13, 2018
fd30b84
change logic of timestamp "update_time"
eerenyuan Sep 15, 2018
919c763
Merge pull request #1 from bookshelf/master
eerenyuan Sep 15, 2018
30ffc63
Revert "fixed bug in model.load's sample"
eerenyuan Sep 15, 2018
58ddd95
handle manually set update ts
eerenyuan Sep 15, 2018
2510355
parse/format example
eerenyuan Sep 19, 2018
2705e15
Merge branch 'master' of github.com:eerenyuan/bookshelf
eerenyuan Sep 19, 2018
1d37ed5
Merge branch 'master' into master
ricardograca Dec 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/base/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,8 @@ ModelBase.prototype.timestamp = function(options) {
const createdAtKey = timestampKeys[0];
const updatedAtKey = timestampKeys[1];
const isNewModel = method === 'insert';
const setUpdatedAt = updatedAtKey && this.hasChanged(updatedAtKey);

if (updatedAtKey && ((isNewModel && !setUpdatedAt) || (this.hasChanged() && !setUpdatedAt))) {
if (updatedAtKey && (isNewModel || this.hasChanged()) && !this.hasChanged(updatedAtKey) ) {
attributes[updatedAtKey] = now;
}

Expand Down
6 changes: 4 additions & 2 deletions tutorials/parse-and-format.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ methods:
Book = bookshelf.Model.extend({
tableName: 'books',
parse: function(response) {
response.tags = JSON.parse(response.tags || '[]');
if(response.tags)
response.tags = JSON.parse(response.tags);
return response;
},
format: function(attributes) {
attributes.tags = JSON.stringify(attributes.tags || []);
if(attributes.tags)
attributes.tags = JSON.stringify(attributes.tags);
return attributes;
}
});
Expand Down