dev/core#1784 fix regression on restore contacts button not working. #17418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This should fix https://lab.civicrm.org/dev/core/-/issues/1784 I think the message from deleting multiple contacts is a bit wonky, but no worse
|
(Standard links)
|
| $session = CRM_Core_Session::singleton(); | ||
| $currentUserId = $session->get('userID'); | ||
|
|
||
| $context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this, FALSE, 'basic'); |
There was a problem hiding this comment.
All moved to $this->setRedirection()
| @@ -228,15 +212,7 @@ public function postProcess() { | |||
| } | |||
| if ($deleted) { | |||
| $title = ts('Deleted'); | |||
| if ($this->_restore) { | |||
| $title = ts('Restored'); | |||
| $status = ts('%1 has been restored from the trash.', [ | |||
There was a problem hiding this comment.
this seems wrong for multiple contacts but should be no worse for this PR (it might be an empty name rather than a random one but not sure that is worse)
There was a problem hiding this comment.
It works because of the 'plural' and 'count' params to ts(). You don't see it that much - came from Drupal I think.
|
Thanks! Will take a look. |
|
|
@demeritcowboy thanks for the review - no new concerns + fixes regression from above so I have merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
This should fix https://lab.civicrm.org/dev/core/-/issues/1784
I think the message from deleting multiple contacts is a bit wonky, but no worse
Before
Contact not restored
After
Contact restored
Technical Details
@demeritcowboy
Comments