Skip to content

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

Merged
JohannesGGE merged 1 commit into
masterfrom
fix/contacts/3404/put-location-in-proper-place
Jun 22, 2023
Merged

fix(sab): put location in proper address field#38856
JohannesGGE merged 1 commit into
masterfrom
fix/contacts/3404/put-location-in-proper-place

Conversation

@JohannesGGE

@JohannesGGEJohannesGGE commented Jun 16, 2023

Copy link
Copy Markdown
Contributor

Summary

beforeafter
imageimage
imageimage

Checklist

@tcitworldtcitworld left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
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
Copy Markdown
Member

Thx for context!

Comment threadapps/dav/lib/CardDAV/Converter.php Outdated
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
Copy Markdown
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
Copy Markdown
Member

/backport to stable27

@JohannesGGE
JohannesGGEforce-pushed the fix/contacts/3404/put-location-in-proper-place branch 3 times, most recently from 04ef8e2 to 8a9b1d8CompareJune 20, 2023 12:50
@JohannesGGE

Copy link
Copy Markdown
ContributorAuthor

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

Signed-off-by: Johannes Merkel <mail@johannesgge.de>
@JohannesGGE
JohannesGGEforce-pushed the fix/contacts/3404/put-location-in-proper-place branch from 8a9b1d8 to 3cb8968CompareJune 20, 2023 14:18
@JohannesGGE
JohannesGGE merged commit 199b978 into masterJun 22, 2023
@JohannesGGE
JohannesGGE deleted the fix/contacts/3404/put-location-in-proper-place branch June 22, 2023 09:51
@backportbot-nextcloud

Copy link
Copy Markdown

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unstructured address shows all value at "Post office box"

4 participants

@JohannesGGE@ChristophWurst@tcitworld@miaulalala