5468-account_privileges #1552

Merged
vicent merged 40 commits from 5468-account_privileges into dev 2023-06-20 12:48:35 +00:00
Contributor
No description provided.
vicent added the
CR / Tests passed
label 2023-05-23 11:30:30 +00:00
vicent added 27 commits 2023-05-23 11:30:31 +00:00
gitea/salix/pipeline/head This commit looks good Details
d6ff61b768
refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head There was a failure building this commit Details
74d543884e
refs #5468 añadido scope al modelo VnUser
gitea/salix/pipeline/head This commit looks good Details
37a7d02006
quitado scope
gitea/salix/pipeline/head This commit looks good Details
8a9e4ccefb
refs #5468 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
87ffd2668e
refs #5468 scope para VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
74ea0ce9fd
refs #5468 actualizados acls
gitea/salix/pipeline/head There was a failure building this commit Details
b10f90fbe1
refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head There was a failure building this commit Details
3f26072787
refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
b65ebc6af3
refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
aea39dd0b7
refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head This commit looks good Details
9426ff204f
refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
4bed88faf5
refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
cd244daf84
refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
96163cb07f
refs #5468 feat: update acls
gitea/salix/pipeline/head There was a failure building this commit Details
191fe4ebf6
refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head This commit looks good Details
db55c3e81b
refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
b7e3e9fa71
refs #5468 feat: add testBack
vicent requested review from juan 2023-05-23 11:30:41 +00:00
vicent added 1 commit 2023-05-23 11:33:28 +00:00
gitea/salix/pipeline/head This commit looks good Details
91207c5a3c
refs #5468 fix: test e2e
vicent added 1 commit 2023-05-23 11:41:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
c9b4c68b0c
refs #5468 refactor: actualizada vista
juan requested changes 2023-05-29 06:35:28 +00:00
@ -12,1 +12,4 @@
require('../methods/vn-user/privileges')(Self);
require('../methods/vn-user/createUser')(Self);
Self.definition.settings.acls.find(acl => acl.property == 'create').permission = 'DENY';
Owner

Si al final has pogut fer açò perque en lloc de crear un nou mètode createUser no fiques els permisos que nosaltres volem al natiu?

Si al final has pogut fer açò perque en lloc de crear un nou mètode `createUser` no fiques els permisos que nosaltres volem al natiu?
Author
Contributor

Esq en les proves que vaig fer no funcionava bé, pero crec q era pq no tornava a fer el gulp. Pq ara ho he provat sí que funciona. Ho modifique.

Esq en les proves que vaig fer no funcionava bé, pero crec q era pq no tornava a fer el gulp. Pq ara ho he provat sí que funciona. Ho modifique.
vicent marked this conversation as resolved
@ -125,0 +124,4 @@
],
"scopes": {
"preview": {
"fields": ["id", "name", "username", "roleFk", "nickname", "lang", "active", "created", "updated", "image", "hasGrant", "realm", "email"]
Owner

Si la linia te mes de 80 caracters ficar les propietats una en cada linia.

Si la linia te mes de 80 caracters ficar les propietats una en cada linia.
vicent marked this conversation as resolved
@ -0,0 +3,4 @@
VALUES
('Role', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
('Role', '*', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
('Role', '*', 'WRITE', 'ALLOW', 'ROLE', 'marketing');
Owner

hr i marketing no deuen de tindre permisos de escritura en Role.

hr i marketing no deuen de tindre permisos de escritura en `Role`.
vicent marked this conversation as resolved
@ -0,0 +20,4 @@
Self.deleteMailAlias = async function(ctx, id) {
const models = Self.app.models;
const isAuthorized = await models.Worker.isAuthorized(ctx, id);
Owner

El modul account no deu de dependre de models de altres moduls: Worker

El modul `account` no deu de dependre de models de altres moduls: `Worker`
vicent marked this conversation as resolved
@ -9,1 +9,4 @@
require('../methods/account/set-password')(Self);
require('../methods/account/change-mail-forwarding')(Self);
require('../methods/account/add-mail-alias')(Self);
require('../methods/account/delete-mail-alias')(Self);
Owner

Perque has creat estos mètodes?

Perque has creat estos mètodes?
Author
Contributor

Per a cumplir estes restriccions:

  • La seccion "reenvio de correo" lo podrá ejecutar uno mismo o algun superior, mirando el campo worker.bossFk
  • La seccion "alias" de correo sólo los podrá ejecutar los superiores de alguien, uno mismo no puede decidir que quiere recibir o que no.
Per a cumplir estes restriccions: - La seccion "reenvio de correo" lo podrá ejecutar uno mismo o algun superior, mirando el campo worker.bossFk - La seccion "alias" de correo sólo los podrá ejecutar los superiores de alguien, uno mismo no puede decidir que quiere recibir o que no.
Author
Contributor

Tras hablar con Juan, se decide que quitar esto. Y añadir los acls para itManagement

Tras hablar con Juan, se decide que quitar esto. Y añadir los acls para itManagement
vicent marked this conversation as resolved
vicent added 1 commit 2023-05-30 07:13:30 +00:00
vicent added 1 commit 2023-05-30 07:59:48 +00:00
gitea/salix/pipeline/head This commit looks good Details
81a8f383aa
refs #5468 feat: no depender del modulo worker
vicent added 1 commit 2023-05-30 08:07:00 +00:00
vicent requested review from juan 2023-05-30 08:07:27 +00:00
vicent added 1 commit 2023-05-30 08:16:19 +00:00
vicent added 1 commit 2023-05-30 08:20:31 +00:00
vicent added 1 commit 2023-05-30 09:51:48 +00:00
vicent added 2 commits 2023-06-08 11:13:32 +00:00
juan requested changes 2023-06-09 20:35:16 +00:00
@ -5,0 +14,4 @@
get isHr() {
return this.aclService.hasAny(['hr']);
}
}
Owner

Para que se han implementado estos métodos en el controlador? Se utilizan?

Para que se han implementado estos métodos en el controlador? Se utilizan?
vicent marked this conversation as resolved
@ -99,2 +95,3 @@
if (res.data)
if (res.data) {
this.businessId = res.data.businessFk;
console.log(this.businessId);
Owner

Has olvidado quitar el console.log

Has olvidado quitar el `console.log`
vicent marked this conversation as resolved
vicent added 1 commit 2023-06-13 05:34:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
6f3c28c4a4
refs #5468 refactor: eliminado código obsoleto
vicent added 1 commit 2023-06-13 05:35:07 +00:00
vicent requested review from juan 2023-06-13 05:38:39 +00:00
juan approved these changes 2023-06-20 11:50:36 +00:00
vicent added 102 commits 2023-06-20 12:39:34 +00:00
gitea/salix/pipeline/head This commit looks good Details
759a140e61
feat(print): create entry-update-comission template
refs #4586
gitea/salix/pipeline/head This commit looks good Details
31d23f7dd1
feat(print): create entry-update-comission template
refs #5112
gitea/salix/pipeline/head This commit looks good Details
eab329b230
refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good Details
2e69e4eea7
a
gitea/salix/pipeline/head This commit looks good Details
fdd22ca2d8
refs #5554 codigo eliminado de vnLayout
gitea/salix/pipeline/head This commit looks good Details
b95ee6cbfa
refs #5554 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
91700e096e
refs #5554 fix: cambiada extensión de archivos de test, y solucionado test
gitea/salix/pipeline/head There was a failure building this commit Details
06d1de5a63
refs #5554 feat: add back test
gitea/salix/pipeline/head There was a failure building this commit Details
32badef787
delete console.log
gitea/salix/pipeline/head This commit looks good Details
2b34dd19e8
refs #554 delete: test back que falla
gitea/salix/pipeline/head There was a failure building this commit Details
b144948dcf
conflictos resueltos
gitea/salix/pipeline/head This commit looks good Details
32a0955c1d
refs #5667 Zone translations fixed
gitea/salix/pipeline/head There was a failure building this commit Details
dfdf948c42
move sql changes
gitea/salix/pipeline/head This commit looks good Details
2c0c0f24b0
reactive
gitea/salix/pipeline/head This commit looks good Details
703c224e91
refs #5513 modified-entry email
gitea/salix/pipeline/head There was a failure building this commit Details
d3c4a6ba5c
refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head This commit looks good Details
59642ab3ca
refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good Details
3386af9b17
refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good Details
cc788d7e06
refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good Details
7127c5a3a8
refs #5325 e2e 1 smart Table
gitea/salix/pipeline/head This commit looks good Details
b7c8b03a65
refs #5325 e2e 2
gitea/salix/pipeline/head This commit looks good Details
d8b041c734
refs #5472 correcto version folder
gitea/salix/pipeline/head This commit looks good Details
fa9719de78
refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head There was a failure building this commit Details
ddd23a9842
refs #5554 refactor: sustiuido window.localStorage por this
gitea/salix/pipeline/head This commit looks good Details
5d3ecfa00e
refs #5554 fix: test front
gitea/salix/pipeline/head This commit looks good Details
92953b9aa8
refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
dd4b62d0a5
description
gitea/salix/pipeline/head This commit looks good Details
61ce25c1e1
refs #5325 all e2e fix smartTable
gitea/salix/pipeline/head This commit looks good Details
3cef6d642d
refs #5325 smartTable e2e fix
gitea/salix/pipeline/head This commit looks good Details
66c5eda6f2
refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good Details
961941ecb3
refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
5288f96836
Merge pull request '5094-ticket_index_docuware' (!1612) from 5094-ticket_index_docuware into dev
Reviewed-on: #1612
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
aa2d3be451
typo
gitea/salix/pipeline/head This commit looks good Details
c62e6fa0eb
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
9e89167d27
Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good Details
9b692e00d4
Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev
Reviewed-on: #1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e8b98a2daf
Merge branch 'dev' into 5651-packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
14ebcf96c0
refs #5842 refactor: change names
gitea/salix/pipeline/head This commit looks good Details
a50de4e509
refs #5842 feat: comprueba que invoiceDate no sea null
gitea/salix/pipeline/head This commit looks good Details
5f2c5c5f9d
refs #5842 delete console.log
gitea/salix/pipeline/head This commit looks good Details
d9c7d3b8f0
Merge pull request '5842-hotfix_recalcularFechaFactura' (!1617) from 5842-hotfix_recalcularFechaFactura into master
Reviewed-on: #1617
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
8b832c68b3
refs #5325 fix back
gitea/salix/pipeline/head This commit looks good Details
a43792be26
Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev
Reviewed-on: #1615
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e8d28ddb02
v232601
gitea/salix/pipeline/head This commit looks good Details
7bff915a7f
refs #5325 back fix correct
gitea/salix/pipeline/head This commit looks good Details
238a6406c5
Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev
Reviewed-on: #1613
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
73133778fc
Merge branch 'dev' into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
a866b92b8c
Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1605) from 5513-back-embalaje into dev
Reviewed-on: #1605
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
50fe53fbb6
Merge branch 'test' into warnFix_ticket_sale_orderBy
gitea/salix/pipeline/head This commit looks good Details
ef0ae335e8
fix: muestra las observaciones de los tickets
gitea/salix/pipeline/head This commit looks good Details
75bb0f8160
refs #5860 fix hash smbhash
gitea/salix/pipeline/head This commit looks good Details
4d957b7593
Merge pull request 'hotfix_ticketObservation' (!1620) from hotfix_ticketObservation into master
Reviewed-on: #1620
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
70413fe0d6
Merge pull request 'refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType' (!1604) from warnFix_ticket_sale_orderBy into test
Reviewed-on: #1604
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
068eca80ab
Merge branch 'dev' into 5112-entryUpdateComission
gitea/salix/pipeline/head This commit looks good Details
63888e2d64
refs #5595 console.log(orderFk, userId) for rawSQL logs
gitea/salix/pipeline/head This commit looks good Details
9fa6e2df71
refs #5595 VnModel.rawSql() bugfix
gitea/salix/pipeline/head This commit looks good Details
503054fe05
refs #5112 modificaciones entry_updateComission
gitea/salix/pipeline/head This commit looks good Details
ffbaa45320
refs #5112 changelog
gitea/salix/pipeline/head This commit looks good Details
dcfb991f94
hotFix(getLeaves): remoteMethodCtx correct defined
gitea/salix/pipeline/head This commit looks good Details
62818a9414
Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev
Reviewed-on: #1625
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e83396de11
Merge branch 'dev' into 5112-entryUpdateComission
gitea/salix/pipeline/head This commit looks good Details
f6cb1cb130
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
004bfdbe1e
Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev
Reviewed-on: #1621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
556bdb52ce
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
3462e49d23
Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev
Reviewed-on: #1566
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f37974c835
Merge branch 'dev' into 5468-account_privileges
alexm approved these changes 2023-06-20 12:48:16 +00:00
alexm approved these changes 2023-06-20 12:48:17 +00:00
vicent merged commit 56917fbfc4 into dev 2023-06-20 12:48:35 +00:00
vicent deleted branch 5468-account_privileges 2023-06-20 12:48:35 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1552
No description provided.