S2FRMS-40/S2FRMS-58 child select #111
Conversation
* master: Preparing 3.14.1 Changelog update CprFetchData adding ajax error fix Preparing 3.14.0 OS-64 Setting a standard value for Automatic purge # Conflicts: # CHANGELOG.md
* develop: (45 commits) Release 3.15.2 ITKDev: php warning if unserialize fails in encrypt patch Release 3.15.1 ITKDev: Enabled encrypt and revisions at the same time Added missing return type Release 3.15.0 Apply coding standards 1062: Removed empty void return docblock 1062: Disabled default encrypt, to allow admin to set new key first #867: Update CHANGELOG #867: Cleanup Update CHANGELOG Ensure array key exists before accessing it Updated CHANGELOG Apply coding standards 1062: Fixed title translation in os2form encrypt 1062: Updated minor code style fixes in webform encrypt 1062: Added notification to encrypt settings page 1062: Fixed code style in module to enable webform encrypt 1062: Added drush command to enable webform encrypt for all forms ... # Conflicts: # CHANGELOG.md
modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php
Outdated
Show resolved
Hide resolved
modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php
Outdated
Show resolved
Hide resolved
modules/os2forms_nemid/src/Plugin/WebformElement/ServiceplatformenCprElementBase.php
Outdated
Show resolved
Hide resolved
modules/os2forms_nemid/src/Plugin/WebformElement/ServiceplatformenCprElementBase.php
Outdated
Show resolved
Hide resolved
|
@rimi-itk added fixes, please check again |
| @@ -59,7 +59,7 @@ public static function mitidChildrenSelectAjax(array &$form, FormStateInterface | |||
|
|
|||
| switch ($element['#type']) { | |||
| case 'os2forms_mitid_child_name': | |||
| $element['#value'] = !$cprLookupResult->isNameAddressProtected() ? $cprLookupResult->getName() : 'Navne- og adressebeskyttet'; | |||
| $element['#value'] = !$cprLookupResult->isNameAddressProtected() ? $cprLookupResult->getName() : t('Name and address protected'); | |||
There was a problem hiding this comment.
You should use StringTranslationTrait and $this->t (rather than t) if possible.
There was a problem hiding this comment.
@rimi-itk
generally agree, but I could not change it in the specified file - it's used as static function, therefore using $this is impossible.
Changed it in other places/files where possible.
please check again
There was a problem hiding this comment.
Makes sense, @stanbellcom. One final comment: #111 (comment)
| ## [3.15.4] 2024-07-08 | ||
|
|
||
| - [#117](https://github.com/OS2Forms/os2forms/pull/117) | ||
| Encrypts all elements if encryption enabled. | ||
| - [#114](https://github.com/OS2Forms/os2forms/pull/114) | ||
| Encrypted computed elements. | ||
|
|
||
| ## [3.15.3] 2024-06-25 | ||
|
|
||
| - [OS-74] Replacing DAWA matrikula select with Datafordeler select | ||
|
|
There was a problem hiding this comment.
These changes do not seem related to this pull request.
There was a problem hiding this comment.
these changes are not visible when you look at the pull request changes: into develop from f/S2FRMS-40_child_select:
https://github.com/OS2Forms/os2forms/pull/111/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4ed
It is in fact a resolution of the conflict we had in CHANGELOG.md file between two branches. If this conflict would have been resolved otherwise (meaning deleting these 10 lines), then upon merging these 10 lines would also be deleted from develop branch.
There was a problem hiding this comment.
Oops, my bad. Thanks for the explanation.
| ## [3.15.4] 2024-07-08 | ||
|
|
||
| - [#117](https://github.com/OS2Forms/os2forms/pull/117) | ||
| Encrypts all elements if encryption enabled. | ||
| - [#114](https://github.com/OS2Forms/os2forms/pull/114) | ||
| Encrypted computed elements. | ||
|
|
||
| ## [3.15.3] 2024-06-25 | ||
|
|
||
| - [OS-74] Replacing DAWA matrikula select with Datafordeler select | ||
|
|
There was a problem hiding this comment.
Oops, my bad. Thanks for the explanation.
|
@stanbellcom, I've approved the changes. Good job! |
S2FRMS-40 child select