LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weitere Korrekturen an den Sci-Typen 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1258 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-15 06:29:33 +00:00
parent 16a86c5f0c
commit c1eb647a73
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitsTable.java
View File

@ -295,6 +295,18 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
final GenericOrganizationalUnitSubordinateCollection subOrgaUnits = final GenericOrganizationalUnitSubordinateCollection subOrgaUnits =
orgaunit. orgaunit.
getSubordinateOrgaUnits(); getSubordinateOrgaUnits();
if ((customizer.getAssocType() != null)
&& !(customizer.getAssocType().isEmpty())) {
subOrgaUnits.addFilter(String.format(
"link.assocType = '%s'",
customizer.getAssocType()));
}
if ((customizer.getContentType() != null)
&& !(customizer.getContentType().isEmpty())) {
subOrgaUnits.addFilter(String.format("objectType = '%s'",
customizer.
getContentType()));
}
if ((subOrgaUnits.size() - 1) == row) { if ((subOrgaUnits.size() - 1) == row) {
final Label label = new Label(""); final Label label = new Label("");

5
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java
View File

@ -21,7 +21,6 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitPublicationsColle
import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.Publication;
import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.developersupport.Comodifications;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -221,8 +220,8 @@ public class GenericOrganizationalUnitPublicationsTable
public void cellSelected(final TableActionEvent event) { public void cellSelected(final TableActionEvent event) {
final PageState state = event.getPageState(); final PageState state = event.getPageState();
final Publication publication = new Publication((BigDecimal) event. final Publication publication = new Publication(new BigDecimal(event.
getRowKey()); getRowKey().toString()));
final GenericOrganizationalUnit orgaunit = final GenericOrganizationalUnit orgaunit =
(GenericOrganizationalUnit) itemModel. (GenericOrganizationalUnit) itemModel.
getSelectedObject(state); getSelectedObject(state);