projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 575d66e)
dev/core#2434 Fix price set id widget
authoreileen <emcnaughton@wikimedia.org>
Wed, 3 Mar 2021 20:19:28 +0000 (09:19 +1300)
committereileen <emcnaughton@wikimedia.org>
Wed, 3 Mar 2021 23:49:33 +0000 (12:49 +1300)
CRM/Contribute/Form/ContributionPage/Amount.php patch | blob | blame | history
CRM/Event/Form/ManageEvent/Fee.php patch | blob | blame | history
CRM/Price/DAO/PriceField.php patch | blob | blame | history
xml/schema/Price/PriceField.xml patch | blob | blame | history

diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php
index a4e88cd3f187bf407e774289af42404b3816391a..cbf3d450465b57ad5e564a34d0699fcdb3b7da19 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Amount.php
+++ b/CRM/Contribute/Form/ContributionPage/Amount.php
@@ -146,7 +146,7 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co
     }
 
     $this->addField('price_set_id', [
-      'entity' => 'PriceSet',
+      'entity' => 'PriceField',
       'options' => $price,
       'onchange' => "showHideAmountBlock( this.value, 'price_set_id' );",
     ]);
diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php
index 8c0ad60540f95ff77cafa14910264f42af266c7c..6a51501be0325453fa457ba3371d3d26d14aaffb 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Fee.php
+++ b/CRM/Event/Form/ManageEvent/Fee.php
@@ -275,7 +275,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent {
       $this->assign('price', TRUE);
     }
     $this->addField('price_set_id', [
-      'entity' => 'PriceSet',
+      'entity' => 'PriceField',
       'options' => $price,
       'onchange' => "return showHideByValue('price_set_id', '', 'map-field', 'block', 'select', false);",
     ]);
diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php
index e7ed68b1c673a1fa891c3cfc3ad1c72a9463210c..054a1c74d70353ec946bbc6a0a9f81011754c093 100644 (file)
--- a/CRM/Price/DAO/PriceField.php
+++ b/CRM/Price/DAO/PriceField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1beb1154376828f4f0efda1cc5b12c6a)
+ * (GenCodeChecksum:bbbe38985671ec274c1655e432977575)
  */
 
 /**
@@ -219,6 +219,7 @@ class CRM_Price_DAO_PriceField extends CRM_Core_DAO {
           'localizable' => 0,
           'FKClassName' => 'CRM_Price_DAO_PriceSet',
           'html' => [
+            'type' => 'Select',
             'label' => ts("Price Set"),
           ],
           'pseudoconstant' => [
diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index a24f57d003bf9e8af753a2440464404649625933..b9c4edaf2b8d1f93b5a1b3994b470a6a37e29341 100644 (file)
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -35,6 +35,7 @@
       <labelColumn>title</labelColumn>
     </pseudoconstant>
     <html>
+      <type>Select</type>
       <label>Price Set</label>
     </html>
     <add>1.8</add>