Merge branch 'main' into attribute_description

SK-CERT · Mar 26, 2024 · f64ba5f · f64ba5f
2 parents 9073d16 + 4e9f3fc
commit f64ba5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/gui/src/store/settings.js b/src/gui/src/store/settings.js
@@ -109,7 +109,7 @@ const getters = {
     getProfileLanguage(state) {
         let lng = state.language;
         if (!lng) {
-            lng = navigator.language.split('-')[0];;
+            lng = navigator.language.split('-')[0];
         }
         if (!lng && typeof (process.env.VUE_APP_TARANIS_NG_LOCALE) !== "undefined") {
             lng = process.env.VUE_APP_TARANIS_NG_LOCALE;

diff --git a/src/gui/src/views/users/AssessView.vue b/src/gui/src/views/users/AssessView.vue
@@ -112,12 +112,16 @@
         created() {
             document.addEventListener("keydown", this.keyAction, false);
             const element = document.querySelector("card-item");
-            element.addEventListener('click', this.targetClick, false);
+            if (element !== null) {
+                element.addEventListener('click', this.targetClick, false);
+            }
         },
         beforeDestroy() {
             document.removeEventListener("keydown", this.keyAction);
             const element = document.querySelector("card-item");
-            element.removeEventListener('click');
+            if (element !== null) {
+                element.removeEventListener('click');
+            }
             this.$root.$off('first-dialog');
             this.$root.$off('clear-cards');
         }