From fc248985a2aa9561c3229b424121d51ec4951a3c Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 3 Jan 2012 19:02:27 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20f=C3=BCr=20Entfernen=20der=20Organization?= =?UTF-8?q?sheit=20beim=20AuthoringStep=20"Publikationslisten"=20bei=20Pub?= =?UTF-8?q?likationen=20(Ticket=201010)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1419 8810af33-2d31-482b-a856-94f89814c4df --- ...cationGenericOrganizationalUnitsTable.java | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java index 3db5c560d..7ef26af7d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java @@ -54,7 +54,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table { 1, PublicationGlobalizationUtil.globalize( "publications.ui.orgaunits.columns.remove").localize(), - TABLE_COL_EDIT)); + TABLE_COL_DEL)); setModelBuilder(new ModelBuilder(itemModel)); @@ -173,8 +173,8 @@ public class PublicationGenericOrganizationalUnitsTable extends Table { } } } - - private class DeleteCellRenderer + + private class DeleteCellRenderer extends LockableImpl implements TableCellRenderer { @@ -189,8 +189,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table { final com.arsdigita.cms.SecurityManager securityManager = Utilities. getSecurityManager(state); final Publication publication = - (Publication) itemModel. - getSelectedObject(state); + (Publication) itemModel.getSelectedObject(state); boolean canEdit = securityManager.canAccess( @@ -199,8 +198,10 @@ public class PublicationGenericOrganizationalUnitsTable extends Table { publication); if (canEdit) { - final ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String)PublicationGlobalizationUtil.globalize("publications.ui.orgaunits.remove.confirm").localize()); + final ControlLink link = new ControlLink(value.toString()); + link.setConfirmation((String) PublicationGlobalizationUtil. + globalize("publications.ui.orgaunits.remove.confirm"). + localize()); return link; } else { final Label label = new Label(""); @@ -208,32 +209,35 @@ public class PublicationGenericOrganizationalUnitsTable extends Table { } } } - - private class ActionListener implements TableActionListener { - @Override + private class ActionListener implements TableActionListener { + + @Override public void cellSelected(final TableActionEvent event) { - final PageState state =event.getPageState(); - - final GenericOrganizationalUnit orgaunit = new GenericOrganizationalUnit((BigDecimal) event.getRowKey()); - final Publication publication = (Publication) itemModel.getSelectedObject(state); - - final TableColumn column = getColumnModel().get(event.getColumn().intValue()); - + final PageState state = event.getPageState(); + + final GenericOrganizationalUnit orgaunit = + new GenericOrganizationalUnit( + new BigDecimal(event.getRowKey().toString())); + final Publication publication = (Publication) itemModel. + getSelectedObject(state); + + final TableColumn column = getColumnModel().get(event.getColumn(). + intValue()); + if (TABLE_COL_EDIT.equals(column.getHeaderKey().toString())) { //Nothing yet - } else if(TABLE_COL_DEL.equals(column.getHeaderKey().toString())) { + } else if (TABLE_COL_DEL.equals(column.getHeaderKey().toString())) { Assert.exists(orgaunit, GenericOrganizationalUnit.class); - + publication.removeOrganizationalUnit(orgaunit); } - + } - @Override + @Override public void headSelected(final TableActionEvent event) { //Nothing yet } - - } + } }