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

hotfix_workCenter2 #1669

Merged
vicent merged 4 commits from hotfix_workCenter2 into master 2023-07-14 11:34:52 +00:00
Conversation 0 Commits 4 Files Changed 10 +85 -88
vicent commented 2023-07-14 11:01:57 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2023-07-14 11:01:57 +00:00
vicent added 3 commits 2023-07-14 11:01:59 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head This commit looks good Details
5716acaa3c fix: test
vicent requested review from alexm 2023-07-14 11:02:05 +00:00
alexm requested changes 2023-07-14 11:08:01 +00:00
db/changes/232802/01-aclAddAlias.sql Outdated
@ -0,0 +1,4 @@
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
alexm commented 2023-07-14 11:07:57 +00:00
Member
Copy Link

Canviali el nom al fitxer si no es confus

Canviali el nom al fitxer si no es confus
vicent marked this conversation as resolved
modules/worker/front/calendar/index.html Outdated
@ -61,3 +61,2 @@
<vn-autocomplete label="Year"
data="$ctrl.yearFilter"
ng-model="$ctrl.year"
data="$ctrl.yearFilter"
alexm commented 2023-07-14 11:03:28 +00:00
Member
Copy Link

Tabulau

Tabulau
vicent marked this conversation as resolved
modules/worker/front/calendar/index.html Outdated
@ -103,3 +69,1 @@
<span translate>Current day</span>
</vn-chip>
</div>
url="Workers/{{$ctrl.$params.id}}/contracts"
alexm commented 2023-07-14 11:04:00 +00:00
Member
Copy Link

Esta mal tabulat

Esta mal tabulat
vicent marked this conversation as resolved
modules/worker/front/descriptor/index.html
@ -28,2 +18,2 @@
Click to allow the user to be disabled
</vn-item>
<vn-item ng-click="$ctrl.handleExcluded()" translate>
{{$ctrl.workerExcluded
alexm commented 2023-07-14 11:06:36 +00:00
Member
Copy Link

Molt bona

Molt bona
vicent marked this conversation as resolved
vicent added 1 commit 2023-07-14 11:11:16 +00:00
gitea/salix/pipeline/head This commit looks good Details
6980392ba1 fix: tabulacion
vicent requested review from alexm 2023-07-14 11:11:18 +00:00
alexm approved these changes 2023-07-14 11:12:08 +00:00
vicent merged commit 06690ca71e into master 2023-07-14 11:34:52 +00:00
vicent deleted branch hotfix_workCenter2 2023-07-14 11:34:52 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
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
2 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#1669
No description provided.
Delete Branch "hotfix_workCenter2"

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?