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

#6286 set right workerTimeControl acls #2557

Merged
jorgep merged 10 commits from 6286-setRightWorkerTimeControlAcls into dev 2024-06-27 08:50:10 +00:00
Conversation 1 Commits 10 Files Changed 11 +93 -47
jorgep commented 2024-06-06 15:27:49 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2024-06-06 15:27:49 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
1912fdd45d refactor: refs #6286 replace name
jorgep added 1 commit 2024-06-07 07:08:25 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
310c2383cb fix: refs #6286 replace id for reason
jorgep added 1 commit 2024-06-12 15:15:49 +00:00
jorgep added 1 commit 2024-06-13 07:10:40 +00:00
jorgep added 1 commit 2024-06-13 11:43:33 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
784bd91e04 fix: refs #6286 update WorkerTimeControl permissions
jorgep added 1 commit 2024-06-13 12:00:22 +00:00
jorgep added 1 commit 2024-06-19 11:42:03 +00:00
jorgep added 1 commit 2024-06-25 14:26:33 +00:00
jorgep requested review from jgallego 2024-06-25 15:24:05 +00:00
jorgep added the
CR / Tests passed
 label 2024-06-25 15:24:08 +00:00
jorgep changed title from WIP: #6286 set right workerTimeControl acls to #6286 set right workerTimeControl acls 2024-06-25 15:24:15 +00:00
jorgep added 1 commit 2024-06-25 15:27:03 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
1f6fd8d6d1 feat: refs #6286 check if is teamBoss
jgallego requested changes 2024-06-25 17:31:53 +00:00
Dismissed
modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
@ -37,0 +38,4 @@
const isSubordinate = await models.Worker.isSubordinate(ctx, workerId, myOptions);
const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
if (!isSubordinate || (workerId === ctx.req.accessToken.userId && !isTeamBoss))
jgallego commented 2024-06-25 17:27:53 +00:00
Owner
Copy Link

Aquí uno se puede autoenviar sus fichadas, se quiere eso?

Aquí uno se puede autoenviar sus fichadas, se quiere eso?
jorgep commented 2024-06-26 07:37:01 +00:00
Author
Member
Copy Link

Aquí solo se puede si eres teamBoss. Lo hablé con @carlosap, quedamos en hacerlo así porque al llamar deleteTimeEntry, se llama a resendWeelyHourEmail y falla esa parte.

Aquí solo se puede si eres teamBoss. Lo hablé con @carlosap, quedamos en hacerlo así porque al llamar deleteTimeEntry, se llama a resendWeelyHourEmail y falla esa parte.
jgallego marked this conversation as resolved
modules/worker/back/models/worker-time-control.json
@ -51,0 +53,4 @@
"accessType": "WRITE",
"permission": "ALLOW",
"principalType": "ROLE",
"principalId": "$owner"
jgallego commented 2024-06-25 17:31:19 +00:00
Owner
Copy Link

Pregunta a @alexm si esto funciona

Pregunta a @alexm si esto funciona
alexm commented 2024-06-26 06:18:18 +00:00
Member
Copy Link

Si $owner, hace que solo tenga permiso para el propio usuario. Para que funcione la tabla debe tener relación con la tabla user (vn-user)

Si $owner, hace que solo tenga permiso para el propio usuario. Para que funcione la tabla debe tener relación con la tabla user (vn-user)
jorgep requested review from jgallego 2024-06-27 08:22:42 +00:00
jgallego approved these changes 2024-06-27 08:25:27 +00:00
jorgep added 1 commit 2024-06-27 08:34:55 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
2b0df02f20 Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls
jorgep merged commit 7af2ae80b7 into dev 2024-06-27 08:50:10 +00:00
jorgep deleted branch 6286-setRightWorkerTimeControlAcls 2024-06-27 08:50:10 +00:00
alexm commented 2024-07-17 08:54:46 +00:00
Member
Copy Link

Faltó cambiar el front para que llamase a /updateMailState

Faltó cambiar el front para que llamase a /updateMailState
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
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#2557
No description provided.
Delete Branch "6286-setRightWorkerTimeControlAcls"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?