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

- 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
master
jensp 2011-11-14 17:04:24 +00:00
parent b38c471a81
commit cf3198cd5d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-cms/src/com/arsdigita/cms/ContentBundle.java
View File

@ -388,11 +388,14 @@ public class ContentBundle extends ContentItem {
instances.addEqualsFilter(LANGUAGE, language); instances.addEqualsFilter(LANGUAGE, language);
} // Else, search also for language independent version } // Else, search also for language independent version
else { else {
/*FilterFactory ff = instances.getFilterFactory();
FilterFactory ff = instances.getFilterFactory();
instances.addFilter( instances.addFilter(
ff.or().addFilter(ff.equals(LANGUAGE, language)). 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(); return !instances.isEmpty();

1
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources.properties
View File

@ -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.title=Involved departments
sciproject.ui.departments.description=Add this project to the projects of a department sciproject.ui.departments.description=Add this project to the projects of a department
scidepartment.ui.members.add=Add member scidepartment.ui.members.add=Add member
scidepartment.ui.superdepartment.add=Add superior deparment

1
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentResources_de.properties
View File

@ -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.title=Beteiligte Abteilungen
sciproject.ui.departments.description=Dieses Projekt den Projektes einer Abteilung hinzuf\u00fcgen sciproject.ui.departments.description=Dieses Projekt den Projektes einer Abteilung hinzuf\u00fcgen
scidepartment.ui.members.add=Mitglied hinzuf\u00fcgen scidepartment.ui.members.add=Mitglied hinzuf\u00fcgen
scidepartment.ui.superdepartment.add=\u00dcbergeordnete Abteilung hinzuf\u00fcgen