From cf3198cd5d54384e981eda3876b8a0d48c6d5350 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 14 Nov 2011 17:04:24 +0000 Subject: [PATCH] =?UTF-8?q?-=20Weitere=20Korrekturen=20an=20den=20SciTypen?= =?UTF-8?q?=20-=20ContentBundle#hasInstance(String,=20boolean)=20arbeitete?= =?UTF-8?q?=20nicht=20in=20alle=20F=C3=A4llen=20korrekt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1256 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms/src/com/arsdigita/cms/ContentBundle.java | 9 ++++++--- .../contenttypes/ui/SciDepartmentResources.properties | 1 + .../contenttypes/ui/SciDepartmentResources_de.properties | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java index 7aad2513b..21666748e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java @@ -388,11 +388,14 @@ public class ContentBundle extends ContentItem { instances.addEqualsFilter(LANGUAGE, language); } // Else, search also for language independent version else { - - FilterFactory ff = instances.getFilterFactory(); + /*FilterFactory ff = instances.getFilterFactory(); instances.addFilter( ff.or().addFilter(ff.equals(LANGUAGE, language)). - addFilter(ff.equals(LANGUAGE, "--"))); + addFilter(ff.equals(LANGUAGE, "--")));*/ + instances.addFilter(String.format("(%s = '%s' or %s = '--')", + LANGUAGE, + language, + LANGUAGE)); } return !instances.isEmpty(); diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources.properties b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources.properties index e7a3c3af8..7250e6dd2 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources.properties +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources.properties @@ -84,3 +84,4 @@ sciproject.ui.departments.delete.confirm=Are you that you want to remove this pr sciproject.ui.departments.title=Involved departments sciproject.ui.departments.description=Add this project to the projects of a department scidepartment.ui.members.add=Add member +scidepartment.ui.superdepartment.add=Add superior deparment diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources_de.properties b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources_de.properties index c0478d982..ebe439145 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources_de.properties +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources_de.properties @@ -84,3 +84,4 @@ sciproject.ui.departments.delete.confirm=Sind Sie sicher, dass Sie dieses Projek sciproject.ui.departments.title=Beteiligte Abteilungen sciproject.ui.departments.description=Dieses Projekt den Projektes einer Abteilung hinzuf\u00fcgen scidepartment.ui.members.add=Mitglied hinzuf\u00fcgen +scidepartment.ui.superdepartment.add=\u00dcbergeordnete Abteilung hinzuf\u00fcgen