You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/10 20:03:30 UTC
svn commit: r473428 - in /lenya/trunk/src/modules-core:
ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java
administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
sitemanagement/usecases/tab/ac/ac.jx
Author: andreas
Date: Fri Nov 10 11:03:30 2006
New Revision: 473428
URL: http://svn.apache.org/viewvc?view=rev&rev=473428
Log:
Fixed handling of access control usecase parameters
Modified:
lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java
lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
Modified: lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java?view=diff&rev=473428&r1=473427&r2=473428
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java (original)
+++ lenya/trunk/src/modules-core/ac-impl/java/src/org/apache/lenya/ac/impl/DefaultPolicy.java Fri Nov 10 11:03:30 2006
@@ -65,10 +65,9 @@
public void addRole(Accreditable accreditable, Role role, String method) {
assert accreditable != null;
assert role != null;
-
- CredentialImpl credential = (CredentialImpl) getCredential(accreditable, role);
- credential.setMethod(method);
- addCredential(credential);
+ CredentialImpl cred = new CredentialImpl(accreditable, role);
+ cred.setMethod(method);
+ addCredential(cred);
}
/**
Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java?view=diff&rev=473428&r1=473427&r2=473428
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java Fri Nov 10 11:03:30 2006
@@ -207,7 +207,6 @@
String type = types[i];
String paramName = operations[j] + "Credential_" + type;
if (getParameterAsString(paramName) != null) {
- boolean inherit = true;
String roleId = getParameterAsString(ROLE);
String method = getParameterAsString(METHOD);
Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx?view=diff&rev=473428&r1=473427&r2=473428
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx Fri Nov 10 11:03:30 2006
@@ -133,16 +133,16 @@
</td>
<td>
<input type="submit"
- name="deleteCredential_sub${credential.getType()}"
+ name="deleteCredential_${credential.getType()}"
i18n:attr="value" value="Delete"/>
<jx:if test="${status.count>1}">
<input type="submit"
- name="upCredential_sub${credential.getType()}"
+ name="upCredential_${credential.getType()}"
i18n:attr="value" value="Move Up"/>
</jx:if>
<jx:if test="${!status.last}">
<input type="submit"
- name="downCredential_sub${credential.getType()}"
+ name="downCredential_${credential.getType()}"
i18n:attr="value" value="Move Down"/>
</jx:if>
</td>
@@ -167,7 +167,7 @@
</tr>
<tr>
- <form method="get" id="form-addCredential_subuser">
+ <form method="get" id="form-addCredential_user">
<input type="hidden" name="lenya.usecase"
value="${usecase.getName()}"/>
<input type="hidden" name="lenya.continuation"
@@ -200,14 +200,14 @@
</select>
</td>
<td>
- <input i18n:attr="value" type="submit" name="addCredential_subuser"
+ <input i18n:attr="value" type="submit" name="addCredential_user"
value="Add"/>
</td>
</form>
</tr>
<tr>
- <form method="get" id="form-addCredential_subgroup">
+ <form method="get" id="form-addCredential_group">
<input type="hidden" name="lenya.usecase"
value="${usecase.getName()}"/>
<input type="hidden" name="lenya.continuation"
@@ -240,7 +240,7 @@
</select>
</td>
<td>
- <input i18n:attr="value" type="submit" name="addCredential_subgroup"
+ <input i18n:attr="value" type="submit" name="addCredential_group"
value="Add"/>
</td>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org