- Weitere Korrekturen an den SciTypen

- ContentBundle#hasInstance(String, boolean) arbeitete nicht in alle Fällen korrekt


git-svn-id: https://svn.libreccm.org/ccm/trunk@1256 8810af33-2d31-482b-a856-94f89814c4df

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();

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

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