From 30179898bd3acbe7423379f7f7b5ce7039d34868 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 20 Jun 2009 07:48:12 +0000 Subject: [PATCH] Fehler im UI zum Verwalten der Organisationseinheiten einer Organization behoben git-svn-id: https://svn.libreccm.org/ccm/trunk@197 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/content-types/Orga2OrgaUnit.pdl | 2 +- .../cms/contenttypes/GenericOrganization.xml | 2 +- .../cms/contenttypes/Orga2OrgaUnit.java | 5 +++-- .../ui/Orga2OrgaUnitPropertyForm.java | 4 ++-- .../cms/contenttypes/ui/Orga2OrgaUnitTable.java | 6 ++++++ .../ui/OrganizationalUnitPropertiesStep.java | 10 +++++----- .../ui/OrganizationalUnitPropertyForm.java | 17 ++++++++--------- ccm-core/src/com/arsdigita/bebop/Page.java | 5 +++++ 8 files changed, 31 insertions(+), 20 deletions(-) diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/Orga2OrgaUnit.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/Orga2OrgaUnit.pdl index e3fb80335..94716f4d8 100644 --- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/Orga2OrgaUnit.pdl +++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/Orga2OrgaUnit.pdl @@ -30,7 +30,7 @@ object type Orga2OrgaUnit extends ACSObject { } association { - composite GenericOrganization[0..1] unitOwner = join ct_orga2orgaunits.unit_owner to ct_genericorganizations.organization_id; + composite GenericOrganization[0..1] unitOwner = join ct_orga2orgaunits.owner_id to ct_genericorganizations.organization_id; composite Orga2OrgaUnit[0..n] units = join ct_genericorganizations.organization_id to ct_orga2orgaunits.owner_id; } diff --git a/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml b/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml index 2d9bab9b0..9b723b750 100644 --- a/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml +++ b/ccm-cms-types-genericorganization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganization.xml @@ -6,7 +6,7 @@ diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/Orga2OrgaUnit.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/Orga2OrgaUnit.java index c8e0f1c92..0ec579408 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/Orga2OrgaUnit.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/Orga2OrgaUnit.java @@ -66,6 +66,7 @@ public class Orga2OrgaUnit extends ACSObject { public void setUnitOwner(GenericOrganization orga) { Assert.exists(orga, GenericOrganization.class); + logger.debug(String.format("Setting unit owner to %s", orga.getOrganizationName())); setAssociation(UNITOWNER, orga); } @@ -123,7 +124,7 @@ public class Orga2OrgaUnit extends ACSObject { swapWithNext("com.arsdigita.cms.contenttypes.allUnitsOrderForOrganization", "com.arsdigita.cms.contenttypes.swapOrga2OrgaUnitWithNextInGroup"); } - public void swapWithPrevious() { + public void swapWithPrevious() { swapWithPrevious("com.arsdigita.cms.contenttypes.allUnitsOrderForOrganization", "com.arsdigita.cms.contenttypes.swapOrga2OrgaUnitWithNextInGroup"); } @@ -136,7 +137,7 @@ public class Orga2OrgaUnit extends ACSObject { } protected DataQuery getSwapQuery(String queryName) { - DataQuery query = SessionManager.getSession().retrieve(queryName); + DataQuery query = SessionManager.getSession().retrieveQuery(queryName); query.setParameter("ownerID", getUnitOwner().getID()); return query; } diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitPropertyForm.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitPropertyForm.java index 579a1d607..42a87631d 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitPropertyForm.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitPropertyForm.java @@ -53,10 +53,10 @@ public class Orga2OrgaUnitPropertyForm extends FormSection implements FormInitLi addSubmissionListener(this); } - protected void addWidgets() { + protected void addWidgets() { add(new Label("OrganizationalUnit")); this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.OrganizationalUnit")); - add(this.m_itemSearch); + add(this.m_itemSearch); } public void addSaveCancelSection() { diff --git a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitTable.java b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitTable.java index 8dd94fb6d..4dcb5fc58 100644 --- a/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitTable.java +++ b/ccm-cms-types-genericorganization/src/com/arsdigita/cms/contenttypes/ui/Orga2OrgaUnitTable.java @@ -77,6 +77,12 @@ public class Orga2OrgaUnitTable extends Table { int i = 0; this.m_orgaUnitCol = new TableColumn(i, "Organizational Unit"); this.m_editCol = new TableColumn(++i, "Edit"); + this.m_delCol = new TableColumn(++i, "Delete"); + this.m_moveUpCol = new TableColumn(++i, ""); + this.m_moveDownCol = new TableColumn(++i, ""); + + model.add(this.m_orgaUnitCol); + model.add(this.m_editCol); model.add(this.m_delCol); model.add(this.m_moveUpCol); model.add(this.m_moveDownCol); diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertiesStep.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertiesStep.java index ed62b4fb7..4e56d8208 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertiesStep.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertiesStep.java @@ -25,8 +25,8 @@ public class OrganizationalUnitPropertiesStep extends SimpleEditStep { private final static Logger logger = Logger.getLogger(OrganizationalUnitPropertiesStep.class); public final static String EDIT_SHEET_NAME = "edit"; - public OrganizationalUnitPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) { - super(itemModel, parent); + public OrganizationalUnitPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) { + super(itemModel, parent); setDefaultEditKey(EDIT_SHEET_NAME); BasicPageForm editSheet; @@ -34,10 +34,10 @@ public class OrganizationalUnitPropertiesStep extends SimpleEditStep { editSheet = new OrganizationalUnitPropertyForm(itemModel, this); add(EDIT_SHEET_NAME, "Edit", new WorkflowLockedComponentAccess(editSheet, itemModel), editSheet.getSaveCancelSection().getCancelButton()); - setDisplayComponent(getOrganizationalUnitPropertySheet(itemModel)); + setDisplayComponent(getOrganizationalUnitPropertySheet(itemModel)); } - public static Component getOrganizationalUnitPropertySheet(ItemSelectionModel itemModel) { + public static Component getOrganizationalUnitPropertySheet(ItemSelectionModel itemModel) { DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel); sheet.add(GlobalizationUtil.globalize("cms.contenttypes.ui.organizatialunit.unitname"), OrganizationalUnit.ORGANIZATIONALUNIT_NAME); @@ -56,7 +56,7 @@ public class OrganizationalUnitPropertiesStep extends SimpleEditStep { } }); } - + return sheet; } } \ No newline at end of file diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertyForm.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertyForm.java index a033dc331..a8cc5f933 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertyForm.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/OrganizationalUnitPropertyForm.java @@ -41,7 +41,7 @@ public class OrganizationalUnitPropertyForm extends BasicPageForm implements For } @Override - public void addWidgets() { + public void addWidgets() { super.addWidgets(); add(new Label(GlobalizationUtil.globalize("cms.contenttypes.organizationalunit.ui.unitname"))); @@ -54,20 +54,20 @@ public class OrganizationalUnitPropertyForm extends BasicPageForm implements For TextArea description = new TextArea(ORGANIZATIONALUNIT_DESCRIPTION); description.setRows(5); description.setCols(30); - add(description); + add(description); } @Override - public void init(FormSectionEvent e) throws FormProcessException { + public void init(FormSectionEvent e) throws FormProcessException { FormData data = e.getFormData(); OrganizationalUnit orgaUnit = (OrganizationalUnit) super.initBasicWidgets(e); data.put(ORGANIZATIONALUNIT_NAME, orgaUnit.getOrganizationalUnitName()); - data.put(ORGANIZATIONALUNIT_DESCRIPTION, orgaUnit.getOrganizationalUnitDescription()); + data.put(ORGANIZATIONALUNIT_DESCRIPTION, orgaUnit.getOrganizationalUnitDescription()); } @Override - public void process(FormSectionEvent e) throws FormProcessException { + public void process(FormSectionEvent e) throws FormProcessException { FormData data = e.getFormData(); OrganizationalUnit orgaUnit = (OrganizationalUnit) super.processBasicWidgets(e); @@ -81,14 +81,13 @@ public class OrganizationalUnitPropertyForm extends BasicPageForm implements For if (this.m_step != null) { this.m_step.maybeForwardToNextStep(e.getPageState()); - } - + } } - public void submitted(FormSectionEvent e) throws FormProcessException { + public void submitted(FormSectionEvent e) throws FormProcessException { if ((this.m_step != null) && (getSaveCancelSection().getCancelButton().isSelected(e.getPageState()))) { this.m_step.cancelStreamlinedCreation(e.getPageState()); - } + } } } diff --git a/ccm-core/src/com/arsdigita/bebop/Page.java b/ccm-core/src/com/arsdigita/bebop/Page.java index 677027eb0..067202792 100755 --- a/ccm-core/src/com/arsdigita/bebop/Page.java +++ b/ccm-core/src/com/arsdigita/bebop/Page.java @@ -965,6 +965,11 @@ public class Page extends BlockStylable implements Container { Assert.assertNotLocked(this); if ( ! stateContains(c) ) { + if(c == null) { + s_log.error("c is null"); + } else { + //s_log.error("c: " + c.toString()); + } String key = c.getKey(); if (key == null) { key = Integer.toString(m_components.size());