summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnna Tsyganova <ATSyganova@IBS.RU>2022-07-15 16:16:42 +0300
committerAnna Tsyganova <ATSyganova@IBS.RU>2022-07-15 16:16:42 +0300
commitf5122b4d85ccb6db03fd23d79d63c0bfbe09d8bf (patch)
tree69eb4b5b4f02219947f0604ce9b2060bb10e1f3e /src
parent8db63450bc20ac7a4276476cdfd461967bed392b (diff)
downloadwebui-vue-f5122b4d85ccb6db03fd23d79d63c0bfbe09d8bf.tar.xz
Fix display date for event logs and fix ldap
Issue: SILABMC-191
Diffstat (limited to 'src')
-rw-r--r--src/main.js2
-rw-r--r--src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main.js b/src/main.js
index 0aae716f..949baaed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -55,7 +55,7 @@ Vue.filter('shortTimeZone', function (value) {
Vue.filter('formatDate', function (value) {
const isUtcDisplay = store.getters['global/isUtcDisplay'];
- if (value instanceof Date) {
+ if (value instanceof Date && !isNaN(value)) {
if (isUtcDisplay) {
return value.toISOString().substring(0, 10);
}
diff --git a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
index d05d9def..6800ead5 100644
--- a/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_sila/SecurityAndAccess/Ldap/Ldap.vue
@@ -28,7 +28,7 @@
:disabled="!form.ldapAuthenticationEnabled || loading"
>
<b-row>
- <b-col md="3" lg="4" xl="7">
+ <b-col md="4" lg="5" xl="7">
<b-form-group
class="mb-4"
:label="$t('pageLdap.form.secureLdapUsingSsl')"
@@ -207,7 +207,7 @@
</b-row>
</b-form-group>
</div>
- <b-row class="mt-4 mb-7">
+ <b-row class="mt-4 mb-5">
<b-col>
<b-btn
variant="primary"