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,
|
1,
|
||||||
PublicationGlobalizationUtil.globalize(
|
PublicationGlobalizationUtil.globalize(
|
||||||
"publications.ui.orgaunits.columns.remove").localize(),
|
"publications.ui.orgaunits.columns.remove").localize(),
|
||||||
TABLE_COL_EDIT));
|
TABLE_COL_DEL));
|
||||||
|
|
||||||
setModelBuilder(new ModelBuilder(itemModel));
|
setModelBuilder(new ModelBuilder(itemModel));
|
||||||
|
|
||||||
|
|
@ -173,8 +173,8 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class DeleteCellRenderer
|
private class DeleteCellRenderer
|
||||||
extends LockableImpl
|
extends LockableImpl
|
||||||
implements TableCellRenderer {
|
implements TableCellRenderer {
|
||||||
|
|
||||||
|
|
@ -189,8 +189,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
||||||
final com.arsdigita.cms.SecurityManager securityManager = Utilities.
|
final com.arsdigita.cms.SecurityManager securityManager = Utilities.
|
||||||
getSecurityManager(state);
|
getSecurityManager(state);
|
||||||
final Publication publication =
|
final Publication publication =
|
||||||
(Publication) itemModel.
|
(Publication) itemModel.getSelectedObject(state);
|
||||||
getSelectedObject(state);
|
|
||||||
|
|
||||||
|
|
||||||
boolean canEdit = securityManager.canAccess(
|
boolean canEdit = securityManager.canAccess(
|
||||||
|
|
@ -199,8 +198,10 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
|
||||||
publication);
|
publication);
|
||||||
|
|
||||||
if (canEdit) {
|
if (canEdit) {
|
||||||
final ControlLink link = new ControlLink(value.toString());
|
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;
|
return link;
|
||||||
} else {
|
} else {
|
||||||
final Label label = new Label("");
|
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) {
|
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 GenericOrganizationalUnit orgaunit =
|
||||||
final Publication publication = (Publication) itemModel.getSelectedObject(state);
|
new GenericOrganizationalUnit(
|
||||||
|
new BigDecimal(event.getRowKey().toString()));
|
||||||
final TableColumn column = getColumnModel().get(event.getColumn().intValue());
|
final Publication publication = (Publication) itemModel.
|
||||||
|
getSelectedObject(state);
|
||||||
|
|
||||||
|
final TableColumn column = getColumnModel().get(event.getColumn().
|
||||||
|
intValue());
|
||||||
|
|
||||||
if (TABLE_COL_EDIT.equals(column.getHeaderKey().toString())) {
|
if (TABLE_COL_EDIT.equals(column.getHeaderKey().toString())) {
|
||||||
//Nothing yet
|
//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);
|
Assert.exists(orgaunit, GenericOrganizationalUnit.class);
|
||||||
|
|
||||||
publication.removeOrganizationalUnit(orgaunit);
|
publication.removeOrganizationalUnit(orgaunit);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void headSelected(final TableActionEvent event) {
|
public void headSelected(final TableActionEvent event) {
|
||||||
//Nothing yet
|
//Nothing yet
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue