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

Edited the admin pane to use the context model again. May still be wrong, needs testing 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4687 8810af33-2d31-482b-a856-94f89814c4df
baka 2017-04-24 13:04:21 +00:00
parent 390aa17f13
commit 577b0ad3c7
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminPane.java
View File

@ -66,9 +66,9 @@ public final class CategoryAdminPane extends BaseAdminPane {
/* Left column */ /* Left column */
/* Use context section */ /* Use context section */
//List list = new List(new CategoryUseContextModelBuilder()); List list = new List(new CategoryUseContextModelBuilder());
//list.setSelectionModel(m_contextModel); list.setSelectionModel(m_contextModel);
//list.addChangeListener(new ContextSelectionListener()); list.addChangeListener(new ContextSelectionListener());
/* Category tree section */ /* Category tree section */
m_categoryTree = new BaseTree(new CategoryTreeModelBuilder(m_contextModel)); m_categoryTree = new BaseTree(new CategoryTreeModelBuilder(m_contextModel));
@ -83,7 +83,7 @@ public final class CategoryAdminPane extends BaseAdminPane {
contextSection.setHeading(new Label(gz("cms.ui.category.use_contexts"))); contextSection.setHeading(new Label(gz("cms.ui.category.use_contexts")));
ActionGroup contextGroup = new ActionGroup(); ActionGroup contextGroup = new ActionGroup();
contextSection.setBody(contextGroup); contextSection.setBody(contextGroup);
//contextGroup.setSubject(list); contextGroup.setSubject(list);
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final PermissionChecker permissionChecker = cdiUtil.findBean(PermissionChecker.class); final PermissionChecker permissionChecker = cdiUtil.findBean(PermissionChecker.class);
@ -128,11 +128,6 @@ public final class CategoryAdminPane extends BaseAdminPane {
getAddLink(), getAddLink(),
getEditLink(), getEditLink(),
getDeleteLink())); getDeleteLink()));
//m_contextList = new List(new ContextListModelBuilder());
//m_contextList.adChangeListener(new ContextListSelectionListener());
//m_contextModel = m_contextList.getSelectionModel();
} }
@Override @Override
@ -176,7 +171,7 @@ public final class CategoryAdminPane extends BaseAdminPane {
DeleteForm(SimpleContainer prompt) { DeleteForm(SimpleContainer prompt) {
super(prompt); super(prompt);
prompt.add(new Label(gz("cms.ui.category.delete_prompt"))); prompt.add(new Label(gz("cms.ui.category.delete_prompt")));
Label catLabel = new Label(); Label catLabel = new Label(gz("PLACEHOLDER TEXT"));
// catLabel.addPrintListener(new PrintListener() { // catLabel.addPrintListener(new PrintListener() {
// public void prepare(PrintEvent pe) { // public void prepare(PrintEvent pe) {
// Label label = (Label) pe.getTarget(); // Label label = (Label) pe.getTarget();
@ -322,17 +317,15 @@ public final class CategoryAdminPane extends BaseAdminPane {
getBody().reset(state); getBody().reset(state);
// if (m_contextModel.isSelected(state)) { if (m_contextModel.isSelected(state)) {
// final Category root = final Category root = (Category) m_contextModel.getSelectedKey(state);
// Category.getRootForObject(CMS.getContext().getContentSection(),
// getUseContext(state)); if (root != null) {
// m_model.setSelectedKey(state, root.getUniqueId());
// if (root != null) { m_categoryTree.reset(state);
// m_model.setSelectedKey(state, root.getID()); }
// //m_categoryTree.reset(state);
// } }
//
// }
if (m_model.isSelected(state)) { if (m_model.isSelected(state)) {
LOGGER.debug("The selection model is selected; displaying " + "the item pane"); LOGGER.debug("The selection model is selected; displaying " + "the item pane");

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java
View File

@ -73,7 +73,7 @@ class CategoryUseContextModelBuilder extends AbstractListModelBuilder {
} }
public Object getElement() { public Object getElement() {
return current; return current.getDomain().getRoot();
} }
public String getKey() { public String getKey() {