From b8ef1b3bbb48921222c6022a6bae1ca36f69a46d Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 18 May 2011 17:30:53 +0000 Subject: [PATCH] Noch einen Fehler im SciOrganization-Modul gefunden und behoben. git-svn-id: https://svn.libreccm.org/ccm/trunk@923 8810af33-2d31-482b-a856-94f89814c4df --- .../pdl/com/arsdigita/content-types/SciOrganization.pdl | 2 +- .../src/com/arsdigita/cms/contenttypes/SciOrganization.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl index b2099a9e4..4a8502902 100644 --- a/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl +++ b/ccm-sci-types-organization/pdl/com/arsdigita/content-types/SciOrganization.pdl @@ -61,7 +61,7 @@ query getIdsOfDepartmentsOfSciOrganization { from ct_sciorga_organizations_departments_map where ct_sciorga_organizations_departments_map.organization_id = :organization } map { - departmentId = ct_sciorga_organizations_departments_map; + departmentId = ct_sciorga_organizations_departments_map.department_id; } } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java index 6e5062b83..acc097ebb 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciOrganization.java @@ -219,8 +219,8 @@ public class SciOrganization extends GenericOrganizationalUnit { SessionManager.getSession().retrieveQuery( "com.arsdigita.cms.contenttypes.getIdsOfDepartmentsOfSciOrganization"); departmentsQuery.setParameter("organization", getID()); - - if (query.size() > 0) { + + if (departmentsQuery.size() > 0) { BigDecimal departmentId; boolean result = false; while (departmentsQuery.next()) {