verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-11-11 12:45:58 +01:00
parent 3a0ff3be38 db4f226f6f
commit 74e4a4e42a
8 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/10240-allSaints/00-role_syncPrivileges.sql
View File

@ -202,7 +202,8 @@ BEGIN
JSON_OBJECT( JSON_OBJECT(
'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'), 'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'),
'mysql_native_password', JSON_VALUE(t.`Priv`, '$.mysql_native_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 FROM tRole r

5
front/core/components/radio/style.scss
View File

@ -1,7 +1,6 @@
@import "variables"; @import "variables";
.vn-radio { .vn-radio {
& > .btn { & > .btn {
border-radius: 50%; border-radius: 50%;
@ -26,8 +25,4 @@
&.disabled.checked > .btn > .mark { &.disabled.checked > .btn > .mark {
background-color: $color-font-secondary; background-color: $color-font-secondary;
} }
> div {
text-overflow: ellipsis;
overflow: hidden;
}
} }

5
modules/account/back/util/sync-ldap.js
View File

@ -226,7 +226,7 @@ class SyncLdap extends SyncConnector {
// Recreate roles // Recreate roles
let roles = await $.Role.find({ let roles = await $.Role.find({
fields: ['id', 'name'] fields: ['id', 'name', 'description']
}); });
let roleRoles = await $.RoleRole.find({ let roleRoles = await $.RoleRole.find({
fields: ['role', 'inheritsFrom'] fields: ['role', 'inheritsFrom']
@ -251,13 +251,12 @@ class SyncLdap extends SyncConnector {
return {key: user.roleFk, val: user.name}; return {key: user.roleFk, val: user.name};
}); });
console.log;
reqs = []; reqs = [];
for (let role of roles) { for (let role of roles) {
let newEntry = { let newEntry = {
objectClass: ['top', 'posixGroup'], objectClass: ['top', 'posixGroup'],
cn: role.name, cn: role.name,
description: role.description,
gidNumber: accountConfig.idBase + role.id gidNumber: accountConfig.idBase + role.id
}; };

3
modules/account/back/util/sync-samba.js
View File

@ -28,6 +28,7 @@ class SyncSamba extends SyncConnector {
url: `ldaps://${sambaConfig.host}:636`, url: `ldaps://${sambaConfig.host}:636`,
tlsOptions: {rejectUnauthorized: false} tlsOptions: {rejectUnauthorized: false}
}); });
await adClient.bind(sambaConfig.adUser, sambaConfig.adPassword);
Object.assign(this, { Object.assign(this, {
sambaConfig, sambaConfig,
@ -98,8 +99,6 @@ class SyncSamba extends SyncConnector {
adClient adClient
} = this; } = this;
await adClient.bind(sambaConfig.adUser, sambaConfig.adPassword);
let opts = { let opts = {
scope: 'sub', scope: 'sub',
attributes: ['sAMAccountName'], attributes: ['sAMAccountName'],

6
modules/account/front/descriptor/index.html
View File

@ -143,13 +143,15 @@
ng-if="$ctrl.askOldPass" ng-if="$ctrl.askOldPass"
label="Old password" label="Old password"
ng-model="$ctrl.oldPassword" ng-model="$ctrl.oldPassword"
type="password"> type="password"
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="New password" label="New password"
ng-model="$ctrl.newPassword" ng-model="$ctrl.newPassword"
type="password" type="password"
info="{{'Password requirements' | translate:$ctrl.passRequirements}}"> info="{{'Password requirements' | translate:$ctrl.passRequirements}}"
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Repeat password" label="Repeat password"

8
modules/account/front/ldap/index.html
View File

@ -9,7 +9,7 @@
name="form" name="form"
ng-submit="watcher.submit()" ng-submit="watcher.submit()"
class="vn-w-md"> class="vn-w-md">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg" vn-focus>
<vn-vertical> <vn-vertical>
<vn-check <vn-check
label="Enable synchronization" label="Enable synchronization"
@ -22,8 +22,7 @@
<vn-textfield <vn-textfield
label="Server" label="Server"
ng-model="$ctrl.config.server" ng-model="$ctrl.config.server"
rule="LdapConfig" rule="LdapConfig">
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="RDN" label="RDN"
@ -79,7 +78,8 @@
<tpl-body> <tpl-body>
<vn-textfield <vn-textfield
label="Username" label="Username"
ng-model="$ctrl.syncUser"> ng-model="$ctrl.syncUser"
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Password" label="Password"

5
modules/account/front/posix/index.html
View File

@ -9,13 +9,12 @@
name="form" name="form"
ng-submit="watcher.submit()" ng-submit="watcher.submit()"
class="vn-w-md"> class="vn-w-md">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg" vn-focus>
<vn-vertical> <vn-vertical>
<vn-textfield <vn-textfield
label="Homedir" label="Homedir"
ng-model="$ctrl.config.homedir" ng-model="$ctrl.config.homedir"
rule="AccountConfig" rule="AccountConfig">
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Shell" label="Shell"

5
modules/account/front/samba/index.html
View File

@ -9,7 +9,7 @@
name="form" name="form"
ng-submit="watcher.submit()" ng-submit="watcher.submit()"
class="vn-w-md"> class="vn-w-md">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg" vn-focus>
<vn-vertical> <vn-vertical>
<vn-check <vn-check
label="Enable synchronization" label="Enable synchronization"
@ -22,8 +22,7 @@
<vn-textfield <vn-textfield
label="Host" label="Host"
ng-model="$ctrl.config.host" ng-model="$ctrl.config.host"
rule="SambaConfig" rule="SambaConfig">
vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="SSH user" label="SSH user"