From 5f736341cc55d922fa938ed7a2de9a20812f3086 Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 16 Nov 2010 16:19:51 +0000 Subject: [PATCH] Fehlerkorrekturen git-svn-id: https://svn.libreccm.org/ccm/trunk@612 8810af33-2d31-482b-a856-94f89814c4df --- .../pdl/com/arsdigita/content-types/Journal.pdl | 2 +- .../arsdigita/cms/contenttypes/ui/JournalArticlesTable.java | 2 +- .../cms/contenttypes/ui/SciDepartmentMemberAddForm.java | 4 ++-- .../cms/contenttypes/ui/SciOrganizationMemberAddForm.java | 4 ++-- .../cms/contenttypes/ui/SciProjectMemberAddForm.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl index 22b91a4a1..94c176e70 100644 --- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl +++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Journal.pdl @@ -39,7 +39,7 @@ association { ArticleInJournal[0..n] articles = join ct_journal.journal_id to ct_journal_article_map.journal_id, - join ct_journal.article_map.article_in_journal_id + join ct_journal_article_map.article_in_journal_id to ct_article_in_journal.article_in_journal_id; Integer[0..1] articleOrder = ct_journal_article_map.article_order INTEGER; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java index 892e8b85b..bfb893e25 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java @@ -286,7 +286,7 @@ public class JournalArticlesTable return label; } else { ControlLink link = new ControlLink( - (String) SciOrganizationGlobalizationUtil.globalize( + (String) PublicationGlobalizationUtil.globalize( "cms.contenttypes.ui.journal.articles.down"). localize()); return link; diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMemberAddForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMemberAddForm.java index af6fb5378..3283fe1dc 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMemberAddForm.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentMemberAddForm.java @@ -19,7 +19,7 @@ */ package com.arsdigita.cms.contenttypes.ui; -import com.arsdigita.cms.contenttypes.SciMember; +import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.SciDepartment; @@ -42,7 +42,7 @@ public class SciDepartmentMemberAddForm @Override protected String getPersonType() { - return SciMember.class.getName(); + return GenericPerson.class.getName(); } @Override diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationMemberAddForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationMemberAddForm.java index 8b48a25cf..0908c6953 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationMemberAddForm.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationMemberAddForm.java @@ -19,7 +19,7 @@ */ package com.arsdigita.cms.contenttypes.ui; -import com.arsdigita.cms.contenttypes.SciMember; +import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.SciOrganization; @@ -44,7 +44,7 @@ public class SciOrganizationMemberAddForm @Override protected String getPersonType() { - return SciMember.class.getName(); + return GenericPerson.class.getName(); } @Override diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectMemberAddForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectMemberAddForm.java index 4d00d930b..09a83ba29 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectMemberAddForm.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectMemberAddForm.java @@ -19,7 +19,7 @@ */ package com.arsdigita.cms.contenttypes.ui; -import com.arsdigita.cms.contenttypes.SciMember; +import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.SciProject; @@ -38,7 +38,7 @@ public class SciProjectMemberAddForm @Override protected String getPersonType() { - return SciMember.class.getName(); + return GenericPerson.class.getName(); } @Override