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

* Fixed tiny bug causing confusing display of subscriptions and privileges in Members prototype

Browse source 
* Modified site permissions to allow unsubscribing one site from within another. (It’s complicated, I know.)
This commit is contained in:
Tobi Schäfer 2009-10-31 20:25:08 +00:00
parent 074fc8f024
commit fd653c4198
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/Members/Members.js
View file

@ -260,18 +260,28 @@ Members.prototype.updated_action = function() {
} }
Members.prototype.privileges_action = function() { Members.prototype.privileges_action = function() {
var site = res.handlers.site;
res.data.title = gettext("Memberships of user {0}", session.user.name); res.data.title = gettext("Memberships of user {0}", session.user.name);
res.data.list = renderList(session.user.memberships, res.data.list = renderList(session.user.memberships, function(item) {
"$Membership#site"); res.handlers.site = item.site;
item.renderSkin("$Membership#site");
return;
});
res.handlers.site = site;
res.data.body = session.user.renderSkinAsString("$User#subscriptions"); res.data.body = session.user.renderSkinAsString("$User#subscriptions");
res.handlers.site.renderSkin("Site#page"); res.handlers.site.renderSkin("Site#page");
return; return;
} }
Members.prototype.subscriptions_action = function() { Members.prototype.subscriptions_action = function() {
var site = res.handlers.site;
res.data.title = gettext("Subscriptions of user {0}", session.user.name); res.data.title = gettext("Subscriptions of user {0}", session.user.name);
res.data.list = renderList(session.user.subscriptions, res.data.list = renderList(session.user.subscriptions, function(item) {
"$Membership#site"); res.handlers.site = item.site;
item.renderSkin("$Membership#site");
return;
});
res.handlers.site = site;
res.data.body = session.user.renderSkinAsString("$User#subscriptions"); res.data.body = session.user.renderSkinAsString("$User#subscriptions");
res.handlers.site.renderSkin("Site#page"); res.handlers.site.renderSkin("Site#page");
return; return;

5
code/Site/Site.js
View file

@ -140,10 +140,9 @@ Site.prototype.getPermission = function(action) {
!Membership.require(Membership.SUBSCRIBER); !Membership.require(Membership.SUBSCRIBER);
case "unsubscribe": case "unsubscribe":
if (Membership.require(Membership.SUBSCRIBER)) { if (User.require(User.REGULAR)) {
var membership = Membership.getByName(session.user.name); var membership = Membership.getByName(session.user.name);
return User.require(User.REGULAR) && membership && return membership && !membership.require(Membership.OWNER);
!membership.require(Membership.OWNER);
} }
} }
return false; return false;