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

* Fixed reference to parent site in Archive

Browse source 
* Fixed _children.filter in Archive
 * Added missing permission checks
 * Modified global defineConstants() method to return the getter function instead of automatically defining it with given argument
 * Added HopObject.macro_macro() method to display userland macro code
 * Removed colorpicker (will be replaced by third-party library)
 * Removed obsolete global constants and functions
 * Overhauled and tested global userland macros like story_macro(), image_macro() etc.
 * Implemented global list_macro() to replace any special listFoobar_macro() methods
 * Moved global autoLogin() method into User prototype
 * Overhauled global randomize_macro()
 * Renamed global evalURL() method to validateUrl() as well as evalEmail() to validateEmail()
 * Re-added accidentally removed subskins to Members.skin
 * Fixed some skin names which were changed recently
 * Remove delete_action() from Membership
 * Fixed foreign key of images collection in Membership
 * Removed global username_macro() and replaced it with appropriate membership macros
 * Moved contents of systemscripts.skin into javascript.skin in Root prototype
 * Removed main_css_action(), main_js_action() and sitecounter_macro() methods from Root
 * Added accessname to sites collection in Root
 * Upgraded jQuery to version 1.2.1
 * Replaced call for global history_macro() with corresponding list_macro() call
 * Renamed "public" collection of Stories prototype to "featured"
 * Moved a lot of styles from Root's style.skin to the one in Site
 * Added comments collection to Site
 * Moved embed.skin as subskin #embed into Site.skin
 * Fixed some minor issues in Story.js (removed check for creator before setting the story's mode)
 * Defined cookie names as constants of User which can be overriden via app.properties userCookie and hashCookie
 * Moved a lot of code into compatibility module
This commit is contained in:
Tobi Schäfer 2007-10-11 23:03:17 +00:00
parent ded7f5fcea
commit df9017ab77
38 changed files with 1154 additions and 1736 deletions
Download patch file Download diff file Expand all files Collapse all files

8
code/Comment/Comment.js
View file

@ -22,7 +22,8 @@
// $URL$
//
defineConstants(Comment, "getStatus", "closed", "pending", "readonly", "public");
Comment.getStatus = defineConstants(Comment, "closed",
"pending", "readonly", "public");
Comment.prototype.constructor = function(parent) {
this.site = parent.site;
@ -49,7 +50,10 @@ Comment.prototype.getPermission = function(action) {
case ".":
case "main":
case "comment":
return this.story.getPermission(action);
return this.site.commentsMode === Site.ENABLED &&
this.story.getPermission(action) &&
this.status !== Comment.CLOSED &&
this.status !== Comment.PENDING;
case "delete":
case "edit":
return this.story.getPermission.call(this, "delete");

2
code/Comment/Comment.skin
View file

@ -17,7 +17,7 @@
Prototype: <% comment.prototype %><br />
Parent: <% comment.parent_type %> #<% comment.parent_id %><br />
Story: <% comment.story %><br /> -->
<% comment.creator link %>, <% comment.created short %>
<% comment.creator link %>, <% comment.created short %>
</div>
<div class="title"><% comment.title %></div>
<div><% comment.text | comment.format %></div>