Merge pull request #22372 from eileenmcnaughton/acl4

enotice fix (with default modifiers)
civicrm · Jan 5, 2022 · e2aeacb · e2aeacb
2 parents a7bda4a + 05c411c
commit e2aeacb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CRM/ACL/Page/EntityRole.php b/CRM/ACL/Page/EntityRole.php
@@ -124,7 +124,7 @@ public function browse() {
     $groups = CRM_Core_PseudoConstant::staticGroup();
 
     while ($dao->fetch()) {
-      $entityRoles[$dao->id] = [];
+      $entityRoles[$dao->id] = ['class' => ''];
       CRM_Core_DAO::storeValues($dao, $entityRoles[$dao->id]);
 
       $entityRoles[$dao->id]['acl_role'] = $aclRoles[$dao->acl_role_id] ?? NULL;

diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl
@@ -31,7 +31,7 @@
         </thead>
         <tbody>
         {foreach from=$rows item=row}
-          <tr id="acl_role-{$row.id}" class="{cycle values="odd-row,even-row"}{if !empty($row.class)} {$row.class}{/if} crm-acl_entity_role crm-entity {if NOT $row.is_active} disabled{/if}">
+          <tr id="acl_role-{$row.id}" class="{cycle values="odd-row,even-row"} {$row.class} crm-acl_entity_role crm-entity {if NOT $row.is_active} disabled{/if}">
             <td class="crm-acl_entity_role-acl_role">{$row.acl_role}</td>
             <td class="crm-acl_entity_role-entity">{$row.entity}</td>
             <td class="crm-acl_entity_role-is_active" id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>