Merge remote-tracking branch 'origin/maven/fixes/9.0' into maven/rele…

…ase/9.0
edu-sharing · Nov 11, 2024 · 153680b · 153680b
2 parents a0cd8ec + ffb472f
commit 153680b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/Backend/services/core/src/main/java/org/edu_sharing/restservices/PersonDao.java b/Backend/services/core/src/main/java/org/edu_sharing/restservices/PersonDao.java
@@ -217,7 +217,7 @@ private static HashMap<String, Serializable> profileToMap(UserProfileEdit profil
 		newUserInfo.put(CCConstants.PROP_USER_LASTNAME, profile.getLastName());
 		newUserInfo.put(CCConstants.PROP_USER_EMAIL, profile.getEmail());
         newUserInfo.put(CCConstants.CM_PROP_PERSON_ABOUT, profile.getAbout());
-        newUserInfo.put(CCConstants.CM_PROP_PERSON_SKILLS, new ArrayList(Arrays.asList(profile.getSkills())));
+		newUserInfo.put(CCConstants.CM_PROP_PERSON_SKILLS, profile.getSkills() != null ? new ArrayList<>(Arrays.asList(profile.getSkills())) : null);
         newUserInfo.put(CCConstants.CM_PROP_PERSON_VCARD, profile.getVCard());
 		if(AuthorityServiceFactory.getLocalService().isGlobalAdmin()) {
 			newUserInfo.put(CCConstants.CM_PROP_PERSON_EDU_SCHOOL_PRIMARY_AFFILIATION, profile.getPrimaryAffiliation());

diff --git a/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts b/Frontend/projects/edu-sharing-ui/src/lib/translations/translations.service.ts
@@ -76,11 +76,26 @@ export class TranslationsService {
                             if (supportedLanguages.indexOf(params.locale) !== -1) {
                                 selectedLanguage = params.locale;
                             } else if (params.locale) {
-                                console.warn(
-                                    `Url requested language ${params.locale}, ` +
-                                        'but it was not found or is not configured in the allowed languages: ' +
-                                        supportedLanguages,
-                                );
+                                if (params.locale === 'de') {
+                                    const deVariants = supportedLanguages.filter((l) =>
+                                        l.startsWith('de-'),
+                                    );
+                                    if (deVariants?.length === 1) {
+                                        selectedLanguage = deVariants[0];
+                                    } else {
+                                        console.warn(
+                                            `Url requested language ${params.locale}, ` +
+                                                'but ambiguous variants are present: ' +
+                                                supportedLanguages,
+                                        );
+                                    }
+                                } else {
+                                    console.warn(
+                                        `Url requested language ${params.locale}, ` +
+                                            'but it was not found or is not configured in the allowed languages: ' +
+                                            supportedLanguages,
+                                    );
+                                }
                             }
                             return {
                                 supportedLanguages,

diff --git a/config/defaults/src/main/resources/metadatasets/xml/mds.xml b/config/defaults/src/main/resources/metadatasets/xml/mds.xml
@@ -1517,7 +1517,14 @@
       </property>
     </query>
     <query join="AND" id="mediacenter_filter">
-      <basequery>{"term":{"type":"ccm:io"}}</basequery>
+      <basequery>{"bool":{"must":[
+        {"term":{"type":"ccm:io"}}
+        ],
+        "must_not":[
+        {"term":{"aspects":"ccm:mediacenter_statistics"}},
+        {"term":{"aspects":"ccm:collection_io_reference"}}
+        ]}}
+      </basequery>
       <specialFilter>exclude_system_folder</specialFilter>
       <specialFilter>exclude_sites_folder</specialFilter>
       <specialFilter>exclude_people_folder</specialFilter>
@@ -1526,9 +1533,6 @@
           {"wildcard":{"properties.cm:name.keyword":{"value":"*${value}*"}}},
           {"wildcard":{"properties.cclom:title":{"value":"*${value}*"}}},
           {"wildcard":{"properties.ccm:replicationsourceid.keyword":{"value":"*${value}*"}}}
-          ],
-          "must_not":[
-          {"term":{"aspects":"ccm:mediacenter_statistics"}}
           ]}}
         </statement>
       </property>