Fix für Entfernen der Organizationsheit beim AuthoringStep "Publikationslisten" bei Publikationen (Ticket 1010)
git-svn-id: https://svn.libreccm.org/ccm/trunk@1419 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
bde7be19d6
commit
fc248985a2
|
|
@ -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));
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ 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(
|
||||
|
|
@ -200,7 +199,9 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
|||
|
||||
if (canEdit) {
|
||||
final ControlLink link = new ControlLink(value.toString());
|
||||
link.setConfirmation((String)PublicationGlobalizationUtil.globalize("publications.ui.orgaunits.remove.confirm").localize());
|
||||
link.setConfirmation((String) PublicationGlobalizationUtil.
|
||||
globalize("publications.ui.orgaunits.remove.confirm").
|
||||
localize());
|
||||
return link;
|
||||
} else {
|
||||
final Label label = new Label("");
|
||||
|
|
@ -209,20 +210,24 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
|||
}
|
||||
}
|
||||
|
||||
private class ActionListener implements TableActionListener {
|
||||
private class ActionListener implements TableActionListener {
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void cellSelected(final TableActionEvent event) {
|
||||
final PageState state =event.getPageState();
|
||||
final PageState state = event.getPageState();
|
||||
|
||||
final GenericOrganizationalUnit orgaunit = new GenericOrganizationalUnit((BigDecimal) event.getRowKey());
|
||||
final Publication publication = (Publication) itemModel.getSelectedObject(state);
|
||||
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());
|
||||
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);
|
||||
|
|
@ -230,10 +235,9 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
|||
|
||||
}
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void headSelected(final TableActionEvent event) {
|
||||
//Nothing yet
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue