Skip to content
Jump to bottom

feature-cfm31 post rebase fixes #1 #262

Merged
merged 2 commits into from Dec 17, 2024
Merged

feature-cfm31 post rebase fixes #1 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a16b7
Fix Copy value button label post-rebase (CFM-31)
arlen Dec 17, 2024
5812ebe
Fix email address top-link post-rebase (CFM-31)
arlen Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 15 additions & 12 deletions app/templates/EmailAddresses/fields-nav.inc
View file
Open in desktop
Expand Up @@ -26,15 +26,18 @@
*/

// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
$topLinks = [
[
'icon' => 'verified_user',
'order' => 'Default',
'label' => __d('operation', 'EmailAddresses.verify.force'),
'if' => 'notVerified',
'link' => [
'action' => 'forceVerify',
$vv_obj->id
],
];
];
if($vv_action != 'add') {
$topLinks = [
[
'icon' => 'verified_user',
'order' => 'Default',
'label' => __d('operation', 'EmailAddresses.verify.force'),
'if' => 'notVerified',
'link' => [
'action' => 'forceVerify',
$vv_obj->id
],
'class' => ''
],
];
}
2 changes: 1 addition & 1 deletion app/webroot/js/comanage/components/common/copy-value-button.js
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ export default {
:aria-label="this.ariaLabel"
@click.stop.prevent="copyValue(this.valueToCopy)">
<span class="material-symbols-outlined">{{ this.copyIcon }}</span>
<span class="cm-copy-value-text">{{ this.txt.copy }}</span>
<span class="cm-copy-value-text">{{ this.txt['operation.copy'] }}</span>
</button>
`
}