Fix regression which caused Price Fields selector to NOT display.

diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index 52e3879331e8131217fba20d6043917b75fae078..81a711a41e07b2e63fb8c2c60e1b5e3c54f8dc75 100644 (file)
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -24,11 +24,11 @@
  +--------------------------------------------------------------------+
 *}
 {if ($action eq 1 or $action eq 2 or $action eq 4) and !$isReserved}
-    {include file="CRM/Price/Form/Field.tpl"}
+  {include file="CRM/Price/Form/Field.tpl"}
 {elseif $action eq 8 and !$usedBy and !$isReserved}
-    {include file="CRM/Price/Form/DeleteField.tpl"}
+  {include file="CRM/Price/Form/DeleteField.tpl"}
 {elseif $action eq 1024 }
-    {include file="CRM/Price/Form/Preview.tpl"}
+  {include file="CRM/Price/Form/Preview.tpl"}
 {elseif ($usedBy and $action eq 8) or $usedBy.civicrm_event or $usedBy.civicrm_contribution_page}
   <div id="price_set_used_by" class="messages status no-popup">
     <div class="icon inform-icon"></div>
@@ -40,68 +40,65 @@
       {include file="CRM/Price/Page/table.tpl"}
     {/if}
   </div>
-{else}
-
-
+{/if}
 
-  {if $priceField}
-    <div class="action-link">
-      {if !$isReserved}
-        <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
-      {/if}
-        <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon preview-icon"></div>{ts}Preview (all fields){/ts}</span></a>
-    </div>
-    <div id="field_page">
-    {strip}
+{if $action NEQ 8 and $priceField}
+  <div class="action-link">
+    {if !$isReserved}
+      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
+    {/if}
+      <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon preview-icon"></div>{ts}Preview (all fields){/ts}</span></a>
+  </div>
+  <div id="field_page">
+  {strip}
   {* handle enable/disable actions*}
-   {include file="CRM/common/enableDisableApi.tpl"}
-   {include file="CRM/common/crmeditable.tpl"}
-         <table id="options" class="row-highlight">
-         <thead>
-         <tr>
-            <th>{ts}Field Label{/ts}</th>
-            <th>{ts}Field Type{/ts}</th>
-            <th>{ts}Order{/ts}</th>
-            <th>{ts}Req?{/ts}</th>
-            <th>{ts}Enabled?{/ts}</th>
-            <th>{ts}Active On{/ts}</th>
-            <th>{ts}Expire On{/ts}</th>
-            <th>{ts}Price{/ts}</th>
-            <th></th>
-        </tr>
-        </thead>
-        {foreach from=$priceField key=fid item=row}
+  {include file="CRM/common/enableDisableApi.tpl"}
+  {include file="CRM/common/crmeditable.tpl"}
+    <table id="options" class="row-highlight">
+      <thead>
+       <tr>
+          <th>{ts}Field Label{/ts}</th>
+          <th>{ts}Field Type{/ts}</th>
+          <th>{ts}Order{/ts}</th>
+          <th>{ts}Req?{/ts}</th>
+          <th>{ts}Enabled?{/ts}</th>
+          <th>{ts}Active On{/ts}</th>
+          <th>{ts}Expire On{/ts}</th>
+          <th>{ts}Price{/ts}</th>
+          <th></th>
+      </tr>
+      </thead>
+      {foreach from=$priceField key=fid item=row}
       <tr id="price_field-{$row.id}" class="crm-entity {cycle values="odd-row,even-row"} {$row.class}{if NOT $row.is_active} disabled{/if}">
-            <td class="crm-editable" data-field="label">{$row.label}</td>
-            <td>{$row.html_type_display}</td>
-            <td class="nowrap">{$row.weight}</td>
-            <td>{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
-            <td>{if $row.active_on}{$row.active_on|date_format:"%Y-%m-%d %T"}{/if}</td>
-            <td>{if $row.expire_on}{$row.expire_on|date_format:"%Y-%m-%d %T"}{/if}</td>
-            <td>{if $row.html_type eq "Text"}{$row.price|crmMoney}{else}<a class="action-item" href="{crmURL p="civicrm/admin/price/field/option" q="action=browse&reset=1&sid=$sid&fid=$fid"}">{if $isReserved}{ts}View Price Options{/ts}{else}{ts}Edit Price Options{/ts}{/if}</a>{/if}</td>
-            <td class="field-action">{$row.action|replace:'xx':$row.id}</td>
-        </tr>
-        {/foreach}
-        </table>
-        {/strip}
-     </div>
-     <div class="action-link">
-      {if !$isReserved}
-         <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
-   {/if}
-         <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon preview-icon"></div>{ts}Preview (all fields){/ts}</span></a>
-     </div>
+        <td class="crm-editable" data-field="label">{$row.label}</td>
+        <td>{$row.html_type_display}</td>
+        <td class="nowrap">{$row.weight}</td>
+        <td>{if $row.is_required eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+        <td id="row_{$row.id}_status">{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+        <td>{if $row.active_on}{$row.active_on|date_format:"%Y-%m-%d %T"}{/if}</td>
+        <td>{if $row.expire_on}{$row.expire_on|date_format:"%Y-%m-%d %T"}{/if}</td>
+        <td>{if $row.html_type eq "Text"}{$row.price|crmMoney}{else}<a class="action-item" href="{crmURL p="civicrm/admin/price/field/option" q="action=browse&reset=1&sid=$sid&fid=$fid"}">{if $isReserved}{ts}View Price Options{/ts}{else}{ts}Edit Price Options{/ts}{/if}</a>{/if}</td>
+        <td class="field-action">{$row.action|replace:'xx':$row.id}</td>
+      </tr>
+      {/foreach}
+    </table>
+  {/strip}
+  </div>
+  <div class="action-link">
+    {if !$isReserved}
+      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
+    {/if}
+    <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon preview-icon"></div>{ts}Preview (all fields){/ts}</span></a>
+  </div>
 
-  {else}
-        {if $action eq 16}
-        <div class="messages status no-popup crm-empty-table">
-            <div class="icon inform-icon"></div>
-            {ts}None found.{/ts}
-        </div>
-        <div class="action-link">
-          <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
-        </div>
-        {/if}
+{else}
+  {if $action eq 16}
+    <div class="messages status no-popup crm-empty-table">
+      <div class="icon inform-icon"></div>
+      {ts}None found.{/ts}
+    </div>
+    <div class="action-link">
+      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon add-icon"></div>{ts}Add Price Field{/ts}</span></a>
+    </div>
   {/if}
 {/if}