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: location deletion not showing up in activity log #1309 #1340

Merged

Conversation

squigglybob
Copy link
Collaborator

resolves #1309

@squigglybob squigglybob marked this pull request as ready for review May 5, 2021 11:16
@squigglybob
Copy link
Collaborator Author

@corsacca I think that fixes it

@corsacca
Copy link
Member

corsacca commented May 7, 2021

In testing i see this fixes the issue for all locations added from now on.
In deleting the a location created before this PR, the delete message will look something like:
image

@squigglybob
Copy link
Collaborator Author

is that ok? or how would you like that to change?

@corsacca
Copy link
Member

corsacca commented May 7, 2021

I don't know if there is anything we can do since the data was not there originally

@corsacca
Copy link
Member

corsacca commented May 7, 2021

Unless we write a special check that tells if it is the old format and just displays "location removed"

@squigglybob
Copy link
Collaborator Author

that would be possible I'm sure

@squigglybob
Copy link
Collaborator Author

@corsacca something like this? although it adds two new translation strings.

The 'location removed' string shouldn't be hit by anybody though, as prior to this PR there hasn't been an activity log for removal of location_meta

@corsacca
Copy link
Member

corsacca commented May 7, 2021

@squigglybob Thanks coding a solution.
If the new way adds extra translations and will rarely be hit, then lets just for for the solution you had initially
Thanks for your patience with the back and forth.

@squigglybob squigglybob changed the title fix: location deletion not showing up in activity log fix: location deletion not showing up in activity log #1309 May 10, 2021
@squigglybob
Copy link
Collaborator Author

@corsacca only one extra translation string "location added" will still be needed for any activity logs for the addition of a location where that location was subsequently removed.

Previously in that case it just showed the truncated string " added to locations" (from '%1$s added to locations" translation but the new translation string would change that to "location added".

We could just leave the older logs as they are as "added to locations" still says the same thing as "location added".

Let me know what you think.

@corsacca corsacca merged commit f9cc4c7 into DiscipleTools:master May 10, 2021
@squigglybob squigglybob deleted the 1309-log-deletion-of-location branch May 11, 2021 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deleting a location is not getting logged
2 participants