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

Changes STAFF_ADMIN to PRIVILEGE_ADMINISTER_ROLES 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4337 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
baka 2016-10-01 10:14:41 +00:00
parent 1046e331ec
commit b31303594c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,12 @@ import com.arsdigita.bebop.form.CheckboxGroup;
import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.Option;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ui.BaseForm; import com.arsdigita.cms.ui.BaseForm;
import com.arsdigita.cms.util.SecurityConstants;
import com.arsdigita.globalization.GlobalizedMessage; 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.security.Role; import org.libreccm.security.Role;
import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import java.util.*; import java.util.*;
@ -80,7 +80,7 @@ public class BaseRoleForm extends BaseForm {
addAction(new Finish()); addAction(new Finish());
addAction(new Cancel()); addAction(new Cancel());
addSecurityListener(SecurityConstants.STAFF_ADMIN); addSecurityListener(CmsConstants.PRIVILEGE_ADMINISTER_ROLES);
} }
private class PrivilegePrinter implements PrintListener { private class PrivilegePrinter implements PrintListener {

6
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java
View File

@ -36,7 +36,6 @@ import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ui.BaseAdminPane; import com.arsdigita.cms.ui.BaseAdminPane;
import com.arsdigita.cms.ui.BaseDeleteForm; import com.arsdigita.cms.ui.BaseDeleteForm;
import com.arsdigita.cms.ui.VisibilityComponent; import com.arsdigita.cms.ui.VisibilityComponent;
import com.arsdigita.cms.util.SecurityConstants;
import com.arsdigita.toolbox.ui.ActionGroup; import com.arsdigita.toolbox.ui.ActionGroup;
import com.arsdigita.toolbox.ui.Section; import com.arsdigita.toolbox.ui.Section;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
@ -44,6 +43,7 @@ import org.apache.log4j.Logger;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.RoleRepository; import org.libreccm.security.RoleRepository;
import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
/** /**
@ -104,7 +104,7 @@ public class RoleAdminPane extends BaseAdminPane {
final ActionLink link = new ActionLink final ActionLink link = new ActionLink
(new Label(gz("cms.ui.role.staff.add"))); (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); ActionGroup.ADD);
final RoleAddForm form = new RoleAddForm(m_model, false); final RoleAddForm form = new RoleAddForm(m_model, false);
@ -241,7 +241,7 @@ public class RoleAdminPane extends BaseAdminPane {
DeleteForm() { DeleteForm() {
super(gz("cms.ui.role.delete_prompt")); super(gz("cms.ui.role.delete_prompt"));
addSecurityListener(SecurityConstants.STAFF_ADMIN); addSecurityListener(CmsConstants.PRIVILEGE_ADMINISTER_ROLES);
} }
public final void process(final FormSectionEvent e) public final void process(final FormSectionEvent e)