From e9b8e0edbb612a4b93438d0f07e748f050220cdd Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 22 Nov 2021 19:08:33 +1300
Subject: [PATCH] Remove a bunch of isset from options.tpl

---
 CRM/Admin/Page/Options.php           | 13 ++++---------
 templates/CRM/Admin/Page/Options.tpl | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php
index fec5b85999..4b2cf8587b 100644
--- a/CRM/Admin/Page/Options.php
+++ b/CRM/Admin/Page/Options.php
@@ -95,9 +95,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
       self::$_gLabel = ts('Option');
     }
 
-    $this->assign('gName', self::$_gName);
-    $this->assign('gLabel', self::$_gLabel);
-
     if (self::$_gName == 'acl_role') {
       CRM_Utils_System::setTitle(ts('Manage ACL Roles'));
       // set breadcrumb to append to admin/access
@@ -128,14 +125,12 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
       ]
     ));
 
-    if (self::$_gName == 'participant_role') {
-      $this->assign('showCounted', TRUE);
-    }
+    $this->assign('showCounted', self::$_gName === 'participant_role');
     $this->assign('isLocked', self::$_isLocked);
     $this->assign('allowLoggedIn', Civi::settings()->get('allow_mail_from_logged_in_contact'));
-    if (self::$_gName == 'activity_type') {
-      $this->assign('showComponent', TRUE);
-    }
+    $this->assign('showComponent', self::$_gName === 'activity_type');
+    $this->assign('gName', self::$_gName);
+    $this->assign('gLabel', self::$_gLabel);
   }
 
   /**
diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index 0e7e5bab47..f08d6baad9 100644
--- a/templates/CRM/Admin/Page/Options.tpl
+++ b/templates/CRM/Admin/Page/Options.tpl
@@ -8,7 +8,7 @@
  +--------------------------------------------------------------------+
 *}
 
-{if empty($gName)}
+{if !$gName}
   {include file="CRM/Admin/Page/OptionGroup.tpl"}
 
 {elseif $action eq 1 or $action eq 2 or $action eq 8}
@@ -48,7 +48,7 @@
     {else}
       {ts}You can use this page to define one or more general Email Addresses that can be selected as the From Address. EXAMPLE: <em>"Client Services" &lt;clientservices@example.org&gt;</em>{/ts}
     {/if}
-  {elseif !empty($isLocked)}
+  {elseif $isLocked}
     {ts}This option group is reserved for system use. You cannot add or delete options in this list.{/ts}
   {else}
     {ts 1=$gLabel}The existing option choices for %1 group are listed below. You can add, edit or delete them from this screen.{/ts}
@@ -58,11 +58,11 @@
 
 <div class="crm-content-block crm-block">
 {if $rows}
-{if !isset($isLocked) || $isLocked ne 1}
+  {if $isLocked ne 1}
     <div class="action-link">
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !isset($gLabel)}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton}
+      {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !$gLabel}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton}
     </div>
-{/if}
+  {/if}
 {foreach from=$rows item=row}
   {if !empty($row.icon)}{assign var='hasIcons' value=TRUE}{/if}
 {/foreach}
@@ -76,7 +76,7 @@
             {if !empty($hasIcons)}
               <th></th>
             {/if}
-            {if !empty($showComponent)}
+            {if $showComponent}
                 <th>{ts}Component{/ts}</th>
             {/if}
             <th>
@@ -101,10 +101,10 @@
                 {/if}
             </th>
             {if $gName eq "payment_instrument"}<th>{ts}Account{/ts}</th>{/if}
-            {if !empty($showCounted)}<th>{ts}Counted?{/ts}</th>{/if}
+            {if $showCounted}<th>{ts}Counted?{/ts}</th>{/if}
             <th id="nosort">{ts}Description{/ts}</th>
             <th>{ts}Order{/ts}</th>
-            {if !empty($showIsDefault)}<th>{ts}Default{/ts}</th>{/if}
+            {if $showIsDefault}<th>{ts}Default{/ts}</th>{/if}
             <th>{ts}Reserved{/ts}</th>
             <th>{ts}Enabled?{/ts}</th>
             <th></th>
@@ -116,7 +116,7 @@
             {if !empty($hasIcons)}
               <td class="crm-admin-options-icon"><i class="crm-i {$row.icon}" aria-hidden="true"></i></td>
             {/if}
-            {if !empty($showComponent)}
+            {if $showComponent}
               <td class="crm-admin-options-component_name">{$row.component_name}</td>
             {/if}
             <td class="crm-admin-options-label crm-editable" data-field="label" {if !empty($row.color)}style="background-color: {$row.color}; color: {$row.color|colorContrast};"{/if}>
@@ -129,12 +129,12 @@
             {if $gName eq "payment_instrument"}
               <td>{$row.financial_account}</td>
             {/if}
-            {if !empty($showCounted)}
+            {if $showCounted}
               <td class="center crm-admin-options-filter">{icon condition=$row.filter}{ts}Counted{/ts}{/icon}</td>
             {/if}
             <td class="crm-admin-options-description crm-editable" data-field="description" data-type="textarea">{if isset($row.description)}{$row.description}{/if}</td>
             <td class="nowrap crm-admin-options-order">{if isset($row.weight)}{$row.weight}{/if}</td>
-            {if !empty($showIsDefault)}
+            {if $showIsDefault}
               <td class="crm-admin-options-is_default" align="center">{if !empty($row.is_default)}{icon}{ts}Default{/ts}{/icon}{/if}&nbsp;</td>
             {/if}
             <td class="crm-admin-options-is_reserved">{if $row.is_reserved eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
@@ -154,8 +154,8 @@
     </div>
 {/if}
     <div class="action-link">
-      {if !isset($isLocked) || $isLocked ne 1}
-        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !isset($gLabel)}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton}
+      {if $isLocked ne 1}
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{if !$gLabel}{ts}Add Option{/ts}{else}{ts 1=$gLabel}Add %1{/ts}{/if}{/crmButton}
       {/if}
       {crmButton p="civicrm/admin/options" q="action=browse&reset=1" class="cancel" icon="check"}{ts}Done{/ts}{/crmButton}
     </div>
-- 
2.25.1