Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sab): put location in proper address field #38856

Merged
merged 1 commit into from Jun 22, 2023

Conversation

JohannesGGE
Copy link
Contributor

@JohannesGGE JohannesGGE commented Jun 16, 2023

Summary

before after
image image
image image

Checklist

Copy link
Member

@tcitworld tcitworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code-wise that's good, but it wasn't assumed the profile Location field was a city before, so this seems a little problematic for people who entered a full street address in that field. 🤷

@ChristophWurst
Copy link
Member

it wasn't assumed the profile Location field was a city before, so this seems a little problematic for people who entered a full street address in that field.

Yeah. I think no matter how we name or hint the profile property, it's never going to be perfect.

Ref nextcloud/contacts#3404 (comment)

@tcitworld
Copy link
Member

Thx for context!

Comment on lines 97 to 98
$vCard->add(new Text($vCard, 'ADR', [null, null, null, $property->getValue(), null, null, null],
['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$vCard->add(new Text($vCard, 'ADR', [null, null, null, $property->getValue(), null, null, null],
['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope]));
$vCard->add(
new Text(
$vCard,
'ADR',
[ null, null, null, $property->getValue(), null, null, null ],
[
'TYPE' => 'OTHER',
'X-NC-SCOPE' => $scope,
],
)
);

My take at formatting this long line 😄

@ChristophWurst
Copy link
Member

/backport to stable27

@JohannesGGE JohannesGGE force-pushed the fix/contacts/3404/put-location-in-proper-place branch 3 times, most recently from 04ef8e2 to 8a9b1d8 Compare June 20, 2023 12:50
@JohannesGGE
Copy link
Contributor Author

Replaced null with '' to make pipeline (phpunit) happy

Signed-off-by: Johannes Merkel <mail@johannesgge.de>
@JohannesGGE JohannesGGE force-pushed the fix/contacts/3404/put-location-in-proper-place branch from 8a9b1d8 to 3cb8968 Compare June 20, 2023 14:18
@JohannesGGE JohannesGGE merged commit 199b978 into master Jun 22, 2023
38 checks passed
@JohannesGGE JohannesGGE deleted the fix/contacts/3404/put-location-in-proper-place branch June 22, 2023 09:51
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unstructured address shows all value at "Post office box"
4 participants