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

Removes the RoleAdminAddForm and it's context in the CMS interface. 

Code is just commented if needed later.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4354 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
baka 2016-10-06 09:29:48 +00:00
parent 8df8169646
commit 55f5b8ef5f
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleItemPane.java
View File

@ -60,7 +60,7 @@ class BaseRoleItemPane extends BaseItemPane {
private final SingleSelectionModel m_model; private final SingleSelectionModel m_model;
private final MemberTable m_members; private final MemberTable m_members;
private final AdminTable m_admins; //private final AdminTable m_admins;
private final SimpleContainer m_detailPane; private final SimpleContainer m_detailPane;
@ -72,13 +72,14 @@ class BaseRoleItemPane extends BaseItemPane {
m_role = role; m_role = role;
m_members = new MemberTable(); m_members = new MemberTable();
m_admins = new AdminTable(); //m_admins = new AdminTable();
final ActionLink memberAddLink = new ActionLink final ActionLink memberAddLink = new ActionLink
(new Label(gz("cms.ui.role.member.add"))); (new Label(gz("cms.ui.role.member.add")));
/*
final ActionLink adminAddLink = new ActionLink final ActionLink adminAddLink = new ActionLink
(new Label(gz("cms.ui.role.admin.add"))); (new Label(gz("cms.ui.role.admin.add")));*/
m_detailPane = new SimpleContainer(); m_detailPane = new SimpleContainer();
add(m_detailPane); add(m_detailPane);
@ -86,7 +87,7 @@ class BaseRoleItemPane extends BaseItemPane {
m_detailPane.add(new SummarySection(editLink, deleteLink)); m_detailPane.add(new SummarySection(editLink, deleteLink));
m_detailPane.add(new MemberSection(memberAddLink)); m_detailPane.add(new MemberSection(memberAddLink));
m_detailPane.add(new AdminSection(adminAddLink)); //m_detailPane.add(new AdminSection(adminAddLink));
final PartySearchForm memberSearchForm = new PartySearchForm(); final PartySearchForm memberSearchForm = new PartySearchForm();
@ -99,9 +100,10 @@ class BaseRoleItemPane extends BaseItemPane {
final PartySearchForm adminSearchForm = new PartySearchForm(); final PartySearchForm adminSearchForm = new PartySearchForm();
add(adminSearchForm); add(adminSearchForm);
/*
final RoleAdminAddForm adminAddForm = new RoleAdminAddForm final RoleAdminAddForm adminAddForm = new RoleAdminAddForm
(m_model, adminSearchForm.getSearchWidget()); (m_model, adminSearchForm.getSearchWidget());
add(adminAddForm); add(adminAddForm);*/
connect(memberAddLink, memberSearchForm); connect(memberAddLink, memberSearchForm);
connect(memberSearchForm, memberAddForm); connect(memberSearchForm, memberAddForm);
@ -109,11 +111,12 @@ class BaseRoleItemPane extends BaseItemPane {
(new CancelListener(memberAddForm.getForm())); (new CancelListener(memberAddForm.getForm()));
resume(memberAddForm.getForm(), m_detailPane); resume(memberAddForm.getForm(), m_detailPane);
/*
connect(adminAddLink, adminSearchForm); connect(adminAddLink, adminSearchForm);
connect(adminSearchForm, adminAddForm); connect(adminSearchForm, adminAddForm);
adminAddForm.getForm().addSubmissionListener adminAddForm.getForm().addSubmissionListener
(new CancelListener(adminAddForm.getForm())); (new CancelListener(adminAddForm.getForm()));
resume(adminAddForm.getForm(), m_detailPane); resume(adminAddForm.getForm(), m_detailPane);*/
} }
@ -182,6 +185,7 @@ class BaseRoleItemPane extends BaseItemPane {
} }
} }
/*
private class AdminSection extends Section { private class AdminSection extends Section {
AdminSection(final ActionLink adminAddLink) { AdminSection(final ActionLink adminAddLink) {
setHeading(gz("cms.ui.role.admins")); setHeading(gz("cms.ui.role.admins"));
@ -192,7 +196,7 @@ class BaseRoleItemPane extends BaseItemPane {
group.setSubject(m_admins); group.setSubject(m_admins);
group.addAction(new AdminVisible(adminAddLink), ActionGroup.ADD); group.addAction(new AdminVisible(adminAddLink), ActionGroup.ADD);
} }
} }*/
private static final String[] s_memberColumns = new String[] { private static final String[] s_memberColumns = new String[] {
@ -235,13 +239,14 @@ class BaseRoleItemPane extends BaseItemPane {
} }
} }
/*
private static final String[] s_adminColumns = new String[] { private static final String[] s_adminColumns = new String[] {
lz("cms.ui.name"), lz("cms.ui.name"),
lz("cms.ui.role.admin.email"), lz("cms.ui.role.admin.email"),
lz("cms.ui.role.admin.remove") lz("cms.ui.role.admin.remove")
}; };*/
/*
private class AdminTable extends Table { private class AdminTable extends Table {
AdminTable() { AdminTable() {
super(new AdminTableModelBuilder(m_role), s_adminColumns); super(new AdminTableModelBuilder(m_role), s_adminColumns);
@ -271,5 +276,5 @@ class BaseRoleItemPane extends BaseItemPane {
} }
} }
} }*/
} }

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