mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 10:08:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account ContactVcardList resolver

Browse source
This commit is contained in:
Timothée Jaussoin 2025-07-10 15:20:10 +00:00
parent da7b401a67
commit 005072e301
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci-files/deploy.yml
View file

@ -1,7 +1,7 @@
rocky8-deploy: rocky8-deploy:
extends: .deploy extends: .deploy
script: script:
- ./deploy_packages.sh rockylinux - ./deploy_packages.sh rockylinux 8
needs: needs:
- rocky8-package - rocky8-package
- rocky8-test - rocky8-test
@ -9,7 +9,7 @@ rocky8-deploy:
rocky9-deploy: rocky9-deploy:
extends: .deploy extends: .deploy
script: script:
- ./deploy_packages.sh rockylinux - ./deploy_packages.sh rockylinux 9
needs: needs:
- rocky9-package - rocky9-package
- rocky9-test - rocky9-test

1
CHANGELOG.md
View file

@ -63,6 +63,7 @@ v2.0
- Fix FLEXIAPI-351 Fix import of CSV generated on Windows - Fix FLEXIAPI-351 Fix import of CSV generated on Windows
- Fix FLEXIAPI-352 Add missing errors box in the password change form - Fix FLEXIAPI-352 Add missing errors box in the password change form
- Fix FLEXIAPI-356 Cleanup and reorganize the pipeline to mutualize some things and save time - Fix FLEXIAPI-356 Cleanup and reorganize the pipeline to mutualize some things and save time
- Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account ContactVcardList resolver
v1.6 v1.6
---- ----

2
flexiapi/app/Helpers/Utils.php
View file

@ -179,7 +179,7 @@ function resolveUserContacts(Request $request)
{ {
$selected = ['id', 'username', 'domain', 'activated', 'dtmf_protocol', 'display_name']; $selected = ['id', 'username', 'domain', 'activated', 'dtmf_protocol', 'display_name'];
return Account::whereIn('id', function ($query) use ($request) { return Account::withoutGlobalScopes()->whereIn('id', function ($query) use ($request) {
$query->select('contact_id') $query->select('contact_id')
->from('contacts') ->from('contacts')
->where('account_id', $request->user()->id) ->where('account_id', $request->user()->id)

12
flexiapi/composer.lock generated
View file

@ -5520,16 +5520,16 @@
}, },
{ {
"name": "respect/validation", "name": "respect/validation",
"version": "2.4.3", "version": "2.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Respect/Validation.git", "url": "https://github.com/Respect/Validation.git",
"reference": "7f4b3b3ec3ccdf330dfc4567bb43698018f3562a" "reference": "f13f10f19978aea33af2a102a2f58f2db1e63619"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Respect/Validation/zipball/7f4b3b3ec3ccdf330dfc4567bb43698018f3562a", "url": "https://api.github.com/repos/Respect/Validation/zipball/f13f10f19978aea33af2a102a2f58f2db1e63619",
"reference": "7f4b3b3ec3ccdf330dfc4567bb43698018f3562a", "reference": "f13f10f19978aea33af2a102a2f58f2db1e63619",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5582,9 +5582,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/Respect/Validation/issues", "issues": "https://github.com/Respect/Validation/issues",
"source": "https://github.com/Respect/Validation/tree/2.4.3" "source": "https://github.com/Respect/Validation/tree/2.4.4"
}, },
"time": "2025-05-14T12:14:59+00:00" "time": "2025-06-07T00:07:21+00:00"
}, },
{ {
"name": "rvxlab/hcaptcha", "name": "rvxlab/hcaptcha",