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

Verschiedener Kleinkram, unter anderem Tippfehler und Formatierung 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2433 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-11-09 14:55:05 +00:00
parent 0537142e38
commit ae2d4faad3
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties
View File

@ -51,7 +51,7 @@ cms.contenttypes.ui.contact.attach_person=Person verkn\u00fcpfen
cms.contenttypes.ui.contact.edit_person=Person bearbeiten cms.contenttypes.ui.contact.edit_person=Person bearbeiten
cms.contenttypes.ui.contact.reattach_person=Person neu verkn\u00fcpfen cms.contenttypes.ui.contact.reattach_person=Person neu verkn\u00fcpfen
cms.contenttypes.ui.genericcontact.delete_person=Person l\u00f6schen cms.contenttypes.ui.genericcontact.delete_person=Person l\u00f6schen
cms.contenttypes.ui.genericcontact.emptyPerson=Zur Zeit ist keine Person verkn\u00fcft cms.contenttypes.ui.genericcontact.emptyPerson=Zur Zeit ist keine Person verkn\u00fcpft
cms.contenttypes.ui.contact.select_person=Bitte w\u00e4hlen Sie einen Content-Item vom Typ Person cms.contenttypes.ui.contact.select_person=Bitte w\u00e4hlen Sie einen Content-Item vom Typ Person
cms.contenttypes.ui.contact.select_person.add=Verkn\u00fcpfen cms.contenttypes.ui.contact.select_person.add=Verkn\u00fcpfen
cms.contenttypes.ui.contact.select_person.change=Ver\u00e4ndern cms.contenttypes.ui.contact.select_person.change=Ver\u00e4ndern

19
ccm-core/src/com/arsdigita/categorization/CategoryTreeModelLite.java
View File

@ -31,9 +31,9 @@ import org.apache.log4j.Logger;
* @version $Revision: #17 $ $DateTime: 2004/08/16 18:10:38 $ * @version $Revision: #17 $ $DateTime: 2004/08/16 18:10:38 $
*/ */
public class CategoryTreeModelLite extends DataQueryTreeModel { public class CategoryTreeModelLite extends DataQueryTreeModel {
private static final Logger s_log = private static final Logger s_log =
Logger.getLogger(CategoryTreeModelLite.class); Logger.getLogger(CategoryTreeModelLite.class);
String m_order = null; String m_order = null;
/** /**
@ -42,8 +42,9 @@ public class CategoryTreeModelLite extends DataQueryTreeModel {
* @param root the root category for this TreeModel * @param root the root category for this TreeModel
*/ */
public CategoryTreeModelLite(Category root) { public CategoryTreeModelLite(Category root) {
this(root,null); this(root, null);
} }
/** /**
* Initializes with the passed in the root Category. * Initializes with the passed in the root Category.
* *
@ -58,25 +59,27 @@ public class CategoryTreeModelLite extends DataQueryTreeModel {
} }
@Override @Override
protected DataQueryTreeIterator getDataQueryTreeIterator protected DataQueryTreeIterator getDataQueryTreeIterator(DataQueryTreeNode node,
(DataQueryTreeNode node, String getSubCategories) { String getSubCategories) {
return new CategoryTreeIterator(node, getSubCategories, m_order); return new CategoryTreeIterator(node, getSubCategories, m_order);
} }
private static class CategoryTreeIterator extends DataQueryTreeIterator { private static class CategoryTreeIterator extends DataQueryTreeIterator {
public CategoryTreeIterator(DataQueryTreeNode node, String getSubCategories, String order) { public CategoryTreeIterator(DataQueryTreeNode node, String getSubCategories, String order) {
super(node,getSubCategories); super(node, getSubCategories);
if (order != null) { if (order != null) {
addOrder(order); addOrder(order);
} }
} }
@Override @Override
public Object next() { public Object next() {
DataQueryTreeNode node = (DataQueryTreeNode)super.next(); DataQueryTreeNode node = (DataQueryTreeNode) super.next();
// m_nodes.getLink // m_nodes.getLink
node.setValue( Category.IS_ABSTRACT, node.setValue(Category.IS_ABSTRACT,
(Boolean)m_nodes.get(Category.IS_ABSTRACT)); (Boolean) m_nodes.get(Category.IS_ABSTRACT));
return node; return node;
} }

2
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSummaryTab.java
View File

@ -281,7 +281,7 @@ public class SciDepartmentSummaryTab implements GenericOrgaUnitTab {
private String getContactTypeName(final String contactTypeKey) { private String getContactTypeName(final String contactTypeKey) {
final RelationAttributeCollection relAttrs = new RelationAttributeCollection(); final RelationAttributeCollection relAttrs = new RelationAttributeCollection();
relAttrs.addFilter(String.format("attribute = '%s'", relAttrs.addFilter(String.format("attribute = '%s'",
"GenericContactTypes")); "GenericOrganizationContactTypes"));
relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey));
relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper. relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper.
getNegotiatedLocale().getLanguage())); getNegotiatedLocale().getLanguage()));

2
ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteSummaryTab.java
View File

@ -346,7 +346,7 @@ public class SciInstituteSummaryTab implements GenericOrgaUnitTab {
private String getContactTypeName(final String contactTypeKey) { private String getContactTypeName(final String contactTypeKey) {
final RelationAttributeCollection relAttrs = new RelationAttributeCollection(); final RelationAttributeCollection relAttrs = new RelationAttributeCollection();
relAttrs.addFilter(String.format("attribute = '%s'", relAttrs.addFilter(String.format("attribute = '%s'",
"GenericContactTypes")); "GenericOrganizationContactTypes"));
relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey));
relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper.getNegotiatedLocale(). relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper.getNegotiatedLocale().
getLanguage())); getLanguage()));

2
ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java
View File

@ -335,7 +335,7 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab {
final RelationAttributeCollection relAttrs = final RelationAttributeCollection relAttrs =
new RelationAttributeCollection(); new RelationAttributeCollection();
relAttrs.addFilter(String.format("attribute = '%s'", relAttrs.addFilter(String.format("attribute = '%s'",
"GenericContactTypes")); "GenericOrganizationContactTypes"));
relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey)); relAttrs.addFilter(String.format("attr_key = '%s'", contactTypeKey));
relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper. relAttrs.addFilter(String.format("lang = '%s'", GlobalizationHelper.
getNegotiatedLocale().getLanguage())); getNegotiatedLocale().getLanguage()));