Skip to content

Commit

Permalink
Merge pull request #28931 from eileenmcnaughton/570-weight
Browse files Browse the repository at this point in the history
dev/core#4892 dev/core#4891  fix weight notices
  • Loading branch information
demeritcowboy authored Jan 8, 2024
2 parents d5fd150 + e220508 commit db3f122
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CRM/Admin/Page/Mapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,14 @@ public function &links() {
'url' => 'civicrm/admin/mapping',
'qs' => 'action=update&id=%%id%%&reset=1',
'title' => ts('Edit Mapping'),
'weight' => CRM_Core_Action::getWeight(CRM_Core_Action::UPDATE),
],
CRM_Core_Action::DELETE => [
'name' => ts('Delete'),
'url' => 'civicrm/admin/mapping',
'qs' => 'action=delete&id=%%id%%',
'title' => ts('Delete Mapping'),
'weight' => CRM_Core_Action::getWeight(CRM_Core_Action::DELETE),
],
];
}
Expand Down
1 change: 1 addition & 0 deletions CRM/Contact/Selector.php
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,7 @@ public function addActions(&$rows) {
'url' => 'civicrm/contact/view/delete',
'qs' => 'reset=1&cid=%%id%%&restore=1',
'title' => ts('Restore Contact'),
'weight' => 80,
],
];
if (CRM_Core_Permission::check('delete contacts')) {
Expand Down

0 comments on commit db3f122

Please sign in to comment.