LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Enables loading of privileges again using the PermissionManager. 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4360 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
baka 2016-10-06 11:00:02 +00:00
parent 4abaf5f4f5
commit ddc5d62a4b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java
View File

@ -19,6 +19,7 @@
package com.arsdigita.cms.ui.role; package com.arsdigita.cms.ui.role;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.ParameterEvent; import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener; import com.arsdigita.bebop.event.ParameterListener;
@ -32,6 +33,8 @@ import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.ui.admin.GlobalizationUtil;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.security.PermissionManager;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
@ -81,21 +84,16 @@ class BaseRoleForm extends BaseForm {
private class PrivilegePrinter implements PrintListener { private class PrivilegePrinter implements PrintListener {
@Override @Override
public final void prepare(final PrintEvent e) { public final void prepare(final PrintEvent e) {
/*final CheckboxGroup target = (CheckboxGroup) e.getTarget(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final PageState state = e.getPageState(); final PermissionManager permissionManager = cdiUtil.findBean(PermissionManager.class);
final DataQuery query = SessionManager.getSession().retrieveQuery final CheckboxGroup target = (CheckboxGroup) e.getTarget();
(RoleFactory.CMS_PRIVILEGES);
query.addOrder(RoleFactory.SORT_ORDER);
while (query.next()) { final List<String> possiblePrivileges = permissionManager.listDefiniedPrivileges(CmsConstants.class);
target.addOption
(new Option((String) query.get(RoleFactory.PRIVILEGE), for (final String privilege : possiblePrivileges) {
(String) query.get(RoleFactory.PRETTY_NAME))); target.addOption(new Option(privilege, new Label(new GlobalizedMessage(privilege))));
} }
query.close();
*/
} }
} }