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

* Fixed permissions for authenticated users to create images, files and polls in open sites

Browse source 
* Fixed name of list item skin in Poll prototype
 * Fixed fallback to _id property in HopObject.macro_macro() method
 * Fixed bug in Membership.getPermission() method causing a subscriber getting the "Owner is not allowed to unsubscribe" error message when trying to unsubscribe from a site
 * Removed relics of tests with ColourMod jQuery plugin in Site#page skin
This commit is contained in:
Tobi Schäfer 2008-05-12 11:33:53 +00:00
parent 46dfdafbe2
commit aed81e62b1
6 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
code/Files/Files.js
View file

@ -30,8 +30,7 @@ Files.prototype.getPermission = function(action) {
case ".":
case "main":
case "create":
return Site.require(Site.OPEN) &&
Membership.require(Membership.SUBSCRIBER) ||
return Site.require(Site.OPEN) && session.user ||
Membership.require(Membership.CONTRIBUTOR) ||
User.require(User.PRIVILEGED);
case "all":

2
code/HopObject/HopObject.js
View file

@ -327,7 +327,7 @@ HopObject.prototype.macro_macro = function(param, handler) {
res.encode("<% ");
res.write(handler || ctor.name.toLowerCase());
res.write(String.SPACE);
res.write(quote(this.name) || this._id);
res.write(quote(this.name || this._id));
res.encode(" %>");
}
return;

3
code/Images/Images.js
View file

@ -31,8 +31,7 @@ Images.prototype.getPermission = function(action) {
case "main":
case "create":
// FIXME: case "tags":
return Site.require(Site.OPEN) &&
Membership.require(Membership.SUBSCRIBER) ||
return Site.require(Site.OPEN) && session.user ||
Membership.require(Membership.CONTRIBUTOR) ||
User.require(User.PRIVILEGED);
case "all":

2
code/Membership/Membership.js
View file

@ -66,7 +66,7 @@ Membership.prototype.constructor = function(user, role) {
}
Membership.prototype.getPermission = function(action) {
if (!this._parent.getPermission("main")) {
if (!res.handlers.site.getPermission("main")) {
return false;
}
switch (action) {

7
code/Polls/Polls.js
View file

@ -31,8 +31,7 @@ Polls.prototype.getPermission = function(action) {
case "main":
case "create":
case "open":
return Site.require(Site.OPEN) &&
Membership.require(Membership.SUBSCRIBER) ||
return Site.require(Site.OPEN) && session.user ||
Membership.require(Membership.CONTRIBUTOR) ||
User.require(User.PRIVILEGED);
case "all":
@ -77,7 +76,7 @@ Polls.prototype.create_action = function() {
Polls.prototype.open_action = function() {
res.data.list = renderList(this.open,
"Poll#listItem", 10, req.queryParams.page);
"$Poll#listItem", 10, req.queryParams.page);
res.data.pager = renderPager(this.open,
this.href(req.action), 10, req.queryParams.page);
res.data.title = gettext("Open polls of {0}", this._parent.title);
@ -87,7 +86,7 @@ Polls.prototype.open_action = function() {
}
Polls.prototype.all_action = function() {
res.data.list = renderList(this, "Poll#listItem", 10, req.queryParams.page);
res.data.list = renderList(this, "$Poll#listItem", 10, req.queryParams.page);
res.data.pager = renderPager(this,
this.href(), 10, req.queryParams.page);
res.data.title = gettext("Polls of {0}", this._parent.title);

4
code/Site/Site.skin
View file

@ -66,10 +66,6 @@ Disallow: /stories/top
<link rel="alternate" type="application/rss+xml" title="Comments of <% site.title %>" href="<% site.href comments.xml %>" />
<link rel="alternate" type="application/rss+xml" title="Site updates of <% root.title %>" href="<% root.href updates.xml %>" />
<!-- link rel="search" type="application/opensearchdescription+xml" href="<% site.href search.xml %>" title="Antville Search" -->
<!-- Testing ColourMod plugin for jQuery -->
<link href="<% file /ColourModStyle.css url %>" rel="stylesheet" type="text/css" />
<script src="<% file /StyleModScript.js url %>" type="text/javascript"></script>
<script src="<% file /ColourModScript.js url %>" type="text/javascript"></script>
</head>
<body>