From 2628faa9d006aaba0c49b8bfed4f9b3a6b9b01fb Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 6 Nov 2020 22:55:47 +0100 Subject: [PATCH 1/7] Sync hotfixes --- db/changes/10240-allSaints/00-role_syncPrivileges.sql | 3 ++- modules/account/back/util/sync-ldap.js | 5 ++--- modules/account/back/util/sync-samba.js | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/db/changes/10240-allSaints/00-role_syncPrivileges.sql b/db/changes/10240-allSaints/00-role_syncPrivileges.sql index 0e3b0d55b..88f1779e1 100644 --- a/db/changes/10240-allSaints/00-role_syncPrivileges.sql +++ b/db/changes/10240-allSaints/00-role_syncPrivileges.sql @@ -202,7 +202,8 @@ BEGIN JSON_OBJECT( 'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'), 'mysql_native_password', JSON_VALUE(t.`Priv`, '$.mysql_native_password'), - 'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string') + 'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string'), + 'ssl_type', JSON_VALUE(t.`Priv`, '$.ssl_type') ) ) FROM tRole r diff --git a/modules/account/back/util/sync-ldap.js b/modules/account/back/util/sync-ldap.js index 3f98633d9..b763cf14d 100644 --- a/modules/account/back/util/sync-ldap.js +++ b/modules/account/back/util/sync-ldap.js @@ -226,7 +226,7 @@ class SyncLdap extends SyncConnector { // Recreate roles let roles = await $.Role.find({ - fields: ['id', 'name'] + fields: ['id', 'name', 'description'] }); let roleRoles = await $.RoleRole.find({ fields: ['role', 'inheritsFrom'] @@ -251,13 +251,12 @@ class SyncLdap extends SyncConnector { return {key: user.roleFk, val: user.name}; }); - console.log; - reqs = []; for (let role of roles) { let newEntry = { objectClass: ['top', 'posixGroup'], cn: role.name, + description: role.description, gidNumber: accountConfig.idBase + role.id }; diff --git a/modules/account/back/util/sync-samba.js b/modules/account/back/util/sync-samba.js index 6e5ef9d5a..e81fc927b 100644 --- a/modules/account/back/util/sync-samba.js +++ b/modules/account/back/util/sync-samba.js @@ -28,6 +28,7 @@ class SyncSamba extends SyncConnector { url: `ldaps://${sambaConfig.host}:636`, tlsOptions: {rejectUnauthorized: false} }); + await adClient.bind(sambaConfig.adUser, sambaConfig.adPassword); Object.assign(this, { sambaConfig, @@ -98,8 +99,6 @@ class SyncSamba extends SyncConnector { adClient } = this; - await adClient.bind(sambaConfig.adUser, sambaConfig.adPassword); - let opts = { scope: 'sub', attributes: ['sAMAccountName'], From 0e2c6ed79ad348fe94f750087e6dcaaca70b40df Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 7 Nov 2020 14:05:48 +0100 Subject: [PATCH 2/7] Account focus fix --- modules/account/front/descriptor/index.html | 6 ++++-- modules/account/front/ldap/index.html | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/account/front/descriptor/index.html b/modules/account/front/descriptor/index.html index 88b1a9c6d..50e4d2177 100644 --- a/modules/account/front/descriptor/index.html +++ b/modules/account/front/descriptor/index.html @@ -143,13 +143,15 @@ ng-if="$ctrl.askOldPass" label="Old password" ng-model="$ctrl.oldPassword" - type="password"> + type="password" + vn-focus> + info="{{'Password requirements' | translate:$ctrl.passRequirements}}" + vn-focus> + ng-model="$ctrl.syncUser" + vn-focus> Date: Sat, 7 Nov 2020 21:05:14 +0100 Subject: [PATCH 3/7] Focus fixes --- front/core/components/radio/style.scss | 5 ----- modules/account/front/ldap/index.html | 5 ++--- modules/account/front/posix/index.html | 5 ++--- modules/account/front/samba/index.html | 5 ++--- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/front/core/components/radio/style.scss b/front/core/components/radio/style.scss index dfb3ac955..2ee037e65 100644 --- a/front/core/components/radio/style.scss +++ b/front/core/components/radio/style.scss @@ -1,7 +1,6 @@ @import "variables"; .vn-radio { - & > .btn { border-radius: 50%; @@ -26,8 +25,4 @@ &.disabled.checked > .btn > .mark { background-color: $color-font-secondary; } - > div { - text-overflow: ellipsis; - overflow: hidden; - } } diff --git a/modules/account/front/ldap/index.html b/modules/account/front/ldap/index.html index 435247f91..e32fd1f79 100644 --- a/modules/account/front/ldap/index.html +++ b/modules/account/front/ldap/index.html @@ -9,7 +9,7 @@ name="form" ng-submit="watcher.submit()" class="vn-w-md"> - + + rule="LdapConfig"> - + + rule="AccountConfig"> - + + rule="SambaConfig"> Date: Wed, 11 Nov 2020 09:11:11 +0100 Subject: [PATCH 4/7] 2591 - Data checked icon --- modules/ticket/front/index/index.html | 31 +++++++++++------------- modules/ticket/front/index/locale/es.yml | 3 ++- modules/ticket/front/index/style.scss | 17 +++++++++++++ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 6d63ccc81..2a56ab115 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -13,9 +13,8 @@ model="model"> - - - Id + + Id Salesperson Date Hour @@ -33,48 +32,46 @@ - + - + + icon="icon-no036"> - - - {{::ticket.id}} + {{::ticket.id}} @@ -190,7 +187,7 @@ - vn-icon { + margin-left: 3px; + margin-right: 3px; + } } \ No newline at end of file From 9d5765724b7969e795f639f102ccdc57cd47d0c8 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 11 Nov 2020 09:17:34 +0100 Subject: [PATCH 5/7] Removed max width --- modules/ticket/front/index/style.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/ticket/front/index/style.scss b/modules/ticket/front/index/style.scss index 3cb94f905..35c4e8b60 100644 --- a/modules/ticket/front/index/style.scss +++ b/modules/ticket/front/index/style.scss @@ -7,11 +7,6 @@ vn-ticket-index { } } - vn-th.icon-field, - vn-td.icon-field { - width: 1px - } - vn-th.icon-field, vn-th.icon-field *, vn-td.icon-field, From 024fda0f6555d382f5a7eb7858ea0b3946eab247 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 11 Nov 2020 09:11:11 +0100 Subject: [PATCH 6/7] 2591 - Data checked icon --- modules/ticket/front/index/index.html | 31 +++++++++++------------- modules/ticket/front/index/locale/es.yml | 3 ++- modules/ticket/front/index/style.scss | 17 +++++++++++++ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 6d63ccc81..2a56ab115 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -13,9 +13,8 @@ model="model"> - - - Id + + Id Salesperson Date Hour @@ -33,48 +32,46 @@ - + - + + icon="icon-no036"> - - - {{::ticket.id}} + {{::ticket.id}} @@ -190,7 +187,7 @@ - vn-icon { + margin-left: 3px; + margin-right: 3px; + } } \ No newline at end of file From 75ff7c297f55a5468ad0c3b74a07ff83fdf55172 Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 11 Nov 2020 09:17:34 +0100 Subject: [PATCH 7/7] Removed max width --- modules/ticket/front/index/style.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/ticket/front/index/style.scss b/modules/ticket/front/index/style.scss index 3cb94f905..35c4e8b60 100644 --- a/modules/ticket/front/index/style.scss +++ b/modules/ticket/front/index/style.scss @@ -7,11 +7,6 @@ vn-ticket-index { } } - vn-th.icon-field, - vn-td.icon-field { - width: 1px - } - vn-th.icon-field, vn-th.icon-field *, vn-td.icon-field,