projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17163 from jitendrapurohit/core-1731
[civicrm-core.git]
/
CRM
/
Price
/
Form
/
Field.php
diff --git
a/CRM/Price/Form/Field.php
b/CRM/Price/Form/Field.php
index 5e4a5c4e8d25e6239cbb81a9594b99d8de915b2d..0b7cbf2f648e7a6cfba05d352719b0c51f7f239c 100644
(file)
--- a/
CRM/Price/Form/Field.php
+++ b/
CRM/Price/Form/Field.php
@@
-419,7
+419,7
@@
class CRM_Price_Form_Field extends CRM_Core_Form {
$publicOptionCount = $_flagOption = $_rowError = 0;
$_showHide = new CRM_Core_ShowHideBlocks('', '');
$publicOptionCount = $_flagOption = $_rowError = 0;
$_showHide = new CRM_Core_ShowHideBlocks('', '');
- $visibilityOptions = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id',
NULL, ['labelColumn' => 'name']
);
+ $visibilityOptions = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id',
'validate'
);
for ($index = 1; $index <= self::NUM_OPTION; $index++) {
for ($index = 1; $index <= self::NUM_OPTION; $index++) {
@@
-574,7
+574,7
@@
class CRM_Price_Form_Field extends CRM_Core_Form {
for ($index = 1; $index <= self::NUM_OPTION; $index++) {
$isOptionSet = !empty($fields['option_label'][$index]) || !empty($fields['option_amount'][$index]);
for ($index = 1; $index <= self::NUM_OPTION; $index++) {
$isOptionSet = !empty($fields['option_label'][$index]) || !empty($fields['option_amount'][$index]);
- $currentOptionVisibility =
CRM_Utils_Array::value($fields['option_visibility_id'][$index], $visibilityOptions)
;
+ $currentOptionVisibility =
$visibilityOptions[$fields['option_visibility_id'][$index]] ?? NULL
;
if ($isOptionSet && $currentOptionVisibility == 'public') {
$errors["option_visibility_id[{$index}]"] = ts('\'Admin\' field should only have \'Admin\' visibility options.');
if ($isOptionSet && $currentOptionVisibility == 'public') {
$errors["option_visibility_id[{$index}]"] = ts('\'Admin\' field should only have \'Admin\' visibility options.');