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

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

This commit is contained in:
Bernat Exposito 2020-11-11 13:57:37 +01:00
parent a060ac5c70 db4f226f6f
commit eb8931bca5
11 changed files with 45 additions and 41 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(
'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

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

@ -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;
}
}

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

@ -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
};

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

@ -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'],

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

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

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

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

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

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

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

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

31
modules/ticket/front/index/index.html
View File

@ -13,9 +13,8 @@
model="model">
</vn-multi-check>
</vn-th>
<vn-th></vn-th>
<vn-th></vn-th>
<vn-th field="id" number>Id</vn-th>
<vn-th class="icon-field"></vn-th>
<vn-th field="id">Id</vn-th>
<vn-th field="salesPersonFk" class="expendable">Salesperson</vn-th>
<vn-th field="shipped">Date</vn-th>
<vn-th>Hour</vn-th>
@ -33,48 +32,46 @@
<a ng-repeat="ticket in model.data"
class="clickable vn-tr search-result"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
<vn-td shrink>
<vn-td>
<vn-check
ng-model="ticket.checked"
vn-click-stop>
</vn-check>
</vn-td>
<vn-td shrink>
<vn-td class="icon-field">
<vn-icon
ng-show="ticket.isTaxDataChecked"
translate-attr="{title: 'Verified data'}"
ng-show="::ticket.isTaxDataChecked === 0"
translate-attr="{title: 'No verified data'}"
class="bright"
icon="check">
icon="icon-no036">
</vn-icon>
</vn-td>
<vn-td shrink>
<vn-icon
ng-show="ticket.hasTicketRequest"
ng-show="::ticket.hasTicketRequest"
translate-attr="{title: 'Purchase request'}"
class="bright"
icon="icon-100">
</vn-icon>
<vn-icon
ng-show="ticket.isAvailable === 0"
ng-show="::ticket.isAvailable === 0"
translate-attr="{title: 'Not available'}"
class="bright"
vn-tooltip="Not available"
icon="icon-unavailable">
</vn-icon>
<vn-icon
ng-show="ticket.isFreezed"
ng-show="::ticket.isFreezed"
translate-attr="{title: 'Client frozen'}"
class="bright"
icon="icon-frozen">
</vn-icon>
<vn-icon
ng-show="ticket.risk"
ng-show="::ticket.risk"
title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
class="bright"
icon="icon-risk">
</vn-icon>
</vn-td>
<vn-td number>{{::ticket.id}}</vn-td>
<vn-td shrink>{{::ticket.id}}</vn-td>
<vn-td class="expendable">
<span
title="{{::ticket.userName}}"
@ -129,7 +126,7 @@
</vn-td>
<vn-td actions>
<vn-icon-button
vn-anchor="{state: 'ticket.card.sale', params: {id: ticket.id}}"
vn-anchor="::{state: 'ticket.card.sale', params: {id: ticket.id}}"
vn-tooltip="Go to lines"
icon="icon-lines">
</vn-icon-button>
@ -190,7 +187,7 @@
<vn-invoice-out-descriptor-popover
vn-id="invoiceOutDescriptor">
</vn-invoice-out-descriptor-popover>
<vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model"
<vn-contextmenu vn-id="contextmenu" model="model"
expr-builder="$ctrl.exprBuilder(param, value)">
<slot-menu>
<vn-item translate

3
modules/ticket/front/index/locale/es.yml
View File

@ -8,4 +8,5 @@ You cannot make a payment on account from multiple clients: No puedes realizar u
Filter by selection: Filtro por selección
Exclude selection: Excluir selección
Remove filter: Quitar filtro por selección
Remove all filters: Eliminar todos los filtros
Remove all filters: Eliminar todos los filtros
No verified data: Sin datos comprobados

12
modules/ticket/front/index/style.scss
View File

@ -6,4 +6,16 @@ vn-ticket-index {
display: none;
}
}
vn-th.icon-field,
vn-th.icon-field *,
vn-td.icon-field,
vn-td.icon-field * {
padding: 0
}
vn-td.icon-field > vn-icon {
margin-left: 3px;
margin-right: 3px;
}
}