Compare commits

..

2 Commits

4 changed files with 94 additions and 111 deletions

View File

@@ -1,6 +0,0 @@
kind: Fixed
body: Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present
time: 2025-06-05T10:13:14.351260769+02:00
custom:
Issue: ""
SchemaChange: No schema change

View File

@@ -136,8 +136,8 @@ export default {
issueIsLoading: false,
actionIsLoading: false,
actionAreLoaded: false,
socialIssuesClassList: 'col-form-label',
socialActionsClassList: 'col-form-label',
socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
};
},
computed: {
@@ -158,17 +158,6 @@ export default {
},
},
mounted() {
/* Load classNames after element is present */
const socialActionsEl = document.querySelector("input#chill_activitybundle_activity_socialActions");
if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
this.socialActionsClassList += ' required';
}
const socialIssuessEl = document.querySelector("input#chill_activitybundle_activity_socialIssues");
if (socialIssuessEl && socialIssuessEl.hasAttribute("required")) {
this.socialIssuesClassList += ' required';
}
/* Load other issues in multiselect */
this.issueIsLoading = true;
this.actionAreLoaded = false;

View File

@@ -4,8 +4,8 @@
<span class="user-job" v-if="user.user_job !== null"
>({{ localizeString(user.user_job.label) }})</span
>
<span class="main-scope" v-if="user.main_scope !== null"
>({{ localizeString(user.main_scope.name) }})</span
<span class="main-scope" v-if="user.main_scope !== null">
({{ localizeString(user.main_scope.name) }})</span
>
<span
v-if="user.isAbsent"
@@ -22,8 +22,8 @@ import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizat
export default {
name: "UserRenderBoxBadge",
methods: {
localizeString() {
return localizeString;
localizeString(translatableString, locale) {
return localizeString(translatableString, locale);
},
},
props: ["user"],