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

Added RoleAdminPane back and fixed the imports. 

Some things are still commented, as there are package local files that need to be added.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4273 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
baka 2016-09-05 11:53:15 +00:00
parent ed824be970
commit 98189d19e4
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java.off → ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPane.java
View File

@ -33,19 +33,22 @@ import com.arsdigita.bebop.list.ListModel;
import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.bebop.list.ListModelBuilder;
import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentSection;
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.kernel.Role;
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;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.libreccm.security.Role;
import org.librecms.contentsection.ContentSection;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* TODO Needs description
*
* @author <a href="mailto:yannick.buelter@yabue.de">Yannick Bülter</a>
* @author Justin Ross &lt;jross@redhat.com&gt; * @author Justin Ross &lt;jross@redhat.com&gt;
* @version $Id: RoleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ * @version $Id: RoleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $
*/ */
@ -54,7 +57,7 @@ public class RoleAdminPane extends BaseAdminPane {
private static final Logger s_log = Logger.getLogger(RoleAdminPane.class); private static final Logger s_log = Logger.getLogger(RoleAdminPane.class);
private final SingleSelectionModel m_model; private final SingleSelectionModel m_model;
private final RoleRequestLocal m_role; //private final RoleRequestLocal m_role;
private final List m_staff; private final List m_staff;
private final List m_viewers; private final List m_viewers;
@ -66,7 +69,7 @@ public class RoleAdminPane extends BaseAdminPane {
m_model.addChangeListener(new SelectionListener()); m_model.addChangeListener(new SelectionListener());
m_role = new SelectionRequestLocal(); //m_role = new SelectionRequestLocal();
m_staff = new List(new StaffListModelBuilder()); m_staff = new List(new StaffListModelBuilder());
m_staff.setSelectionModel(m_model); m_staff.setSelectionModel(m_model);
@ -83,14 +86,12 @@ public class RoleAdminPane extends BaseAdminPane {
final ViewerSection viewers = new ViewerSection(); final ViewerSection viewers = new ViewerSection();
left.add(viewers); left.add(viewers);
// XXX there need to be two edit forms with different boolean //setEdit(gz("cms.ui.role.edit"), new RoleEditForm(m_role, false));
// args. this is broken //setDelete(gz("cms.ui.role.delete"), new DeleteForm());
setEdit(gz("cms.ui.role.edit"), new RoleEditForm(m_role, false));
setDelete(gz("cms.ui.role.delete"), new DeleteForm());
setIntroPane(new Label(gz("cms.ui.role.intro"))); setIntroPane(new Label(gz("cms.ui.role.intro")));
setItemPane(new BaseRoleItemPane(m_model, m_role, //setItemPane(new BaseRoleItemPane(m_model, m_role,
getEditLink(), getDeleteLink())); // getEditLink(), getDeleteLink()));
} }
private class StaffSection extends Section { private class StaffSection extends Section {
@ -105,12 +106,12 @@ 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, STAFF_ADMIN), //group.addAction(new VisibilityComponent(link, STAFF_ADMIN),
ActionGroup.ADD); // ActionGroup.ADD);
final RoleAddForm form = new RoleAddForm(m_model, false); //final RoleAddForm form = new RoleAddForm(m_model, false);
getBody().add(form); //getBody().add(form);
getBody().connect(link, form); //getBody().connect(link, form);
} }
} }
@ -126,12 +127,12 @@ public class RoleAdminPane extends BaseAdminPane {
final ActionLink link = new ActionLink final ActionLink link = new ActionLink
(new Label(gz("cms.ui.role.viewer.add"))); (new Label(gz("cms.ui.role.viewer.add")));
group.addAction(new VisibilityComponent(link, STAFF_ADMIN), //group.addAction(new VisibilityComponent(link, STAFF_ADMIN),
ActionGroup.ADD); // ActionGroup.ADD);
final RoleAddForm form = new RoleAddForm(m_model, true); //final RoleAddForm form = new RoleAddForm(m_model, true);
getBody().add(form); //getBody().add(form);
getBody().connect(link, form); //getBody().connect(link, form);
} }
} }
@ -152,7 +153,7 @@ public class RoleAdminPane extends BaseAdminPane {
} }
} }
} }
/*
private class SelectionRequestLocal extends RoleRequestLocal { private class SelectionRequestLocal extends RoleRequestLocal {
protected final Object initialValue(final PageState state) { protected final Object initialValue(final PageState state) {
final String id = m_model.getSelectedKey(state).toString(); final String id = m_model.getSelectedKey(state).toString();
@ -160,7 +161,7 @@ public class RoleAdminPane extends BaseAdminPane {
return new Role(new BigDecimal(id)); return new Role(new BigDecimal(id));
} }
} }
*/
private static class StaffListModelBuilder extends LockableImpl private static class StaffListModelBuilder extends LockableImpl
implements ListModelBuilder { implements ListModelBuilder {
public StaffListModelBuilder() { public StaffListModelBuilder() {
@ -172,8 +173,9 @@ public class RoleAdminPane extends BaseAdminPane {
final ContentSection section = final ContentSection section =
CMS.getContext().getContentSection(); CMS.getContext().getContentSection();
return new RoleListModel //return new RoleListModel
(section.getStaffGroup().getOrderedRoles()); // (section.getStaffGroup().getOrderedRoles());
return null;
} }
} }
@ -184,8 +186,9 @@ public class RoleAdminPane extends BaseAdminPane {
final ContentSection section = final ContentSection section =
CMS.getContext().getContentSection(); CMS.getContext().getContentSection();
return new RoleListModel //return new RoleListModel
(section.getViewersGroup().getOrderedRoles()); // (section.getViewersGroup().getOrderedRoles());#
return null;
} }
} }
@ -193,14 +196,14 @@ public class RoleAdminPane extends BaseAdminPane {
DeleteForm() { DeleteForm() {
super(gz("cms.ui.role.delete_prompt")); super(gz("cms.ui.role.delete_prompt"));
addSecurityListener(STAFF_ADMIN); //addSecurityListener(STAFF_ADMIN);
} }
public final void process(final FormSectionEvent e) public final void process(final FormSectionEvent e)
throws FormProcessException { throws FormProcessException {
final PageState state = e.getPageState(); final PageState state = e.getPageState();
m_role.getRole(state).delete(); //m_role.getRole(state).delete();
m_model.clearSelection(state); m_model.clearSelection(state);
} }

2
ccm-core/src/main/java/com/arsdigita/toolbox/ui/SelectionPanel.java
View File

@ -36,7 +36,7 @@ import com.arsdigita.util.Assert;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* * TODO Needs description
*/ */
public class SelectionPanel extends LayoutPanel implements Resettable { public class SelectionPanel extends LayoutPanel implements Resettable {