From b31303594ca5d16dec834bb802d12a38e90ee0bc Mon Sep 17 00:00:00 2001 From: baka Date: Sat, 1 Oct 2016 10:14:41 +0000 Subject: [PATCH] Changes STAFF_ADMIN to PRIVILEGE_ADMINISTER_ROLES git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4337 8810af33-2d31-482b-a856-94f89814c4df --- .../main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java | 4 ++-- .../main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java index 0f8ef9d65..229fe32a3 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleForm.java @@ -28,12 +28,12 @@ import com.arsdigita.bebop.form.CheckboxGroup; import com.arsdigita.bebop.form.Option; import com.arsdigita.cms.CMS; import com.arsdigita.cms.ui.BaseForm; -import com.arsdigita.cms.util.SecurityConstants; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; import org.libreccm.security.Role; +import org.librecms.CmsConstants; import org.librecms.contentsection.ContentSection; import java.util.*; @@ -80,7 +80,7 @@ public class BaseRoleForm extends BaseForm { addAction(new Finish()); addAction(new Cancel()); - addSecurityListener(SecurityConstants.STAFF_ADMIN); + addSecurityListener(CmsConstants.PRIVILEGE_ADMINISTER_ROLES); } private class PrivilegePrinter implements PrintListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java index 94c75bcf3..74304fa38 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java @@ -36,7 +36,6 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.ui.BaseAdminPane; import com.arsdigita.cms.ui.BaseDeleteForm; import com.arsdigita.cms.ui.VisibilityComponent; -import com.arsdigita.cms.util.SecurityConstants; import com.arsdigita.toolbox.ui.ActionGroup; import com.arsdigita.toolbox.ui.Section; import com.arsdigita.util.LockableImpl; @@ -44,6 +43,7 @@ import org.apache.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.Role; import org.libreccm.security.RoleRepository; +import org.librecms.CmsConstants; import org.librecms.contentsection.ContentSection; /** @@ -104,7 +104,7 @@ public class RoleAdminPane extends BaseAdminPane { final ActionLink link = new ActionLink (new Label(gz("cms.ui.role.staff.add"))); - group.addAction(new VisibilityComponent(link, SecurityConstants.STAFF_ADMIN), + group.addAction(new VisibilityComponent(link, CmsConstants.PRIVILEGE_ADMINISTER_ROLES), ActionGroup.ADD); final RoleAddForm form = new RoleAddForm(m_model, false); @@ -241,7 +241,7 @@ public class RoleAdminPane extends BaseAdminPane { DeleteForm() { super(gz("cms.ui.role.delete_prompt")); - addSecurityListener(SecurityConstants.STAFF_ADMIN); + addSecurityListener(CmsConstants.PRIVILEGE_ADMINISTER_ROLES); } public final void process(final FormSectionEvent e)