antville/antville
antville/antville
1
1
Fork 0
Code Issues 48 Pull requests 17 Projects Releases 9 Wiki Activity Actions 1

* Fixed bug causing immediate or minor story and comment updates to wrongly set the modification dates

Browse source 
* Added casting and trimming to File.getName() method
 * Fixed permissions in Membership
This commit is contained in:
Tobi Schäfer 2008-05-10 09:08:55 +00:00
parent 05f80fe2ab
commit 85137389c5
4 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
code/Comment/Comment.js
View file

@ -88,17 +88,21 @@ Comment.prototype.update = function(data) {
if (!data.title && !data.text) {
throw Error(gettext("Please enter at least something into the 'title' or 'text' field."));
}
// Get difference to current content before applying changes
var delta = this.getDelta(data);
this.title = data.title;
this.text = data.text;
this.setMetadata(data);
if (this.site.commentMode === Site.MODERATED ||
this.story.commentMode === Site.MODERATED) {
if (this.story.commentMode === Story.MODERATED) {
this.mode = Comment.PENDING;
} else if (this.story.status !== Story.PRIVATE && this.getDelta(data) > 50) {
this.site.modified = new Date;
} else if (delta > 50) {
this.modified = new Date;
if (this.story.status !== Story.CLOSED) {
this.site.modified = this.modified;
}
}
this.clearCache();
this.touch();
this.modifier = session.user;
return;
}

2
code/File/File.js
View file

@ -39,7 +39,7 @@ File.remove = function() {
File.getName = function(name) {
if (name) {
//return name.replace(/[^\w\d\s._-]/g, String.EMPTY);
return name.replace(/[\/\\:;?+\[\]{}|#"`<>^]/g, String.EMPTY);
return String(name).trim().replace(/[\/\\:;?+\[\]{}|#"`<>^]/g, String.EMPTY);
}
return null;
}

6
code/Membership/Membership.js
View file

@ -66,8 +66,12 @@ Membership.prototype.constructor = function(user, role) {
}
Membership.prototype.getPermission = function(action) {
if (!this._parent.getPermission("main")) {
return false;
}
switch (action) {
case "contact": return true;
case "contact":
return true;
case "edit":
return this.creator !== session.user;
case "delete":

19
code/Story/Story.js
View file

@ -169,12 +169,10 @@ Story.prototype.getFormOptions = function(name) {
Story.prototype.update = function(data) {
var site = this.site || res.handlers.site;
var delta = this.getDelta(data);
if (!data.title && !data.text) {
throw Error(gettext("Please enter at least something into the 'title' or 'text' field."));
}
if (data.created) {
try {
this.created = data.created.toDate("yyyy-MM-dd HH:mm",
@ -185,6 +183,8 @@ Story.prototype.update = function(data) {
}
}
// Get difference to current content before applying changes
var delta = this.getDelta(data);
this.title = data.title ? data.title.trim() : String.EMPTY;
this.text = data.text ? data.text.trim() : String.EMPTY;
this.status = data.status;
@ -197,13 +197,16 @@ Story.prototype.update = function(data) {
this.isTransient() && this.persist();
this.setTags(data.tags || data.tag_array);
if (this.status !== Story.CLOSED && delta > 50) {
if (delta > 50) {
site.hitchWebHook();
site.modified = new Date;
this.modified = new Date;
if (this.status !== Story.CLOSED) {
site.modified = this.modified;
}
}
this.clearCache();
this.touch();
this.modifier = session.user;
return;
}
@ -257,7 +260,7 @@ Story.prototype.comment_action = function() {
try {
comment.update(req.postParams);
this.add(comment);
// Force addition to aggressively cached subcollection
// Force addition to aggressively cached collection
(this.story || this).comments.add(comment);
comment.notify(req.action);
delete session.data.backup;
@ -410,8 +413,8 @@ Story.prototype.getDelta = function(data) {
delta += deltify(data[key], this.metadata.get(key))
}
}
// In-between updates (10 min) get zero delta
var timex = (new Date - this.modified) > Date.ONEMINUTE * 10 ? 1 : 0;
// In-between updates (1 hour) get zero delta
var timex = (new Date - this.modified) > Date.ONEHOUR ? 1 : 0;
return delta * timex;
}