From 5e59ce482e2fd2bda836f181c47f34eb9384bb1e Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 30 Nov 2018 06:26:53 +0000 Subject: [PATCH] dev/core#527 Add in abiity to set translated text for Submit and Cancel button text Convert to using entity fields style adding to form --- CRM/Core/DAO/UFGroup.php | 8 +++++++- CRM/UF/Form/AdvanceSetting.php | 8 ++++++-- CRM/UF/Form/Group.php | 4 +++- templates/CRM/UF/Form/AdvanceSetting.tpl | 15 ++++++--------- templates/CRM/UF/Form/Group.tpl | 10 ++++++---- xml/schema/Core/UFGroup.xml | 6 ++++++ 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php index af15113339..27bfa1f2a3 100644 --- a/CRM/Core/DAO/UFGroup.php +++ b/CRM/Core/DAO/UFGroup.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Core/UFGroup.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:e5e629c4f6d56d238b4ac28e822cea8a) + * (GenCodeChecksum:0f78fb49440e1cf5d43fd3db5a43ee7e) */ /** @@ -551,6 +551,9 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', 'localizable' => 1, + 'html' => [ + 'type' => 'Text', + ], ], 'submit_button_text' => [ 'name' => 'submit_button_text', @@ -564,6 +567,9 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO { 'entity' => 'UFGroup', 'bao' => 'CRM_Core_BAO_UFGroup', 'localizable' => 1, + 'html' => [ + 'type' => 'Text', + ], ], 'add_cancel_button' => [ 'name' => 'add_cancel_button', diff --git a/CRM/UF/Form/AdvanceSetting.php b/CRM/UF/Form/AdvanceSetting.php index 4c872910d1..f2945f63da 100644 --- a/CRM/UF/Form/AdvanceSetting.php +++ b/CRM/UF/Form/AdvanceSetting.php @@ -38,6 +38,12 @@ class CRM_UF_Form_AdvanceSetting extends CRM_UF_Form_Group { * @param CRM_Core_Form $form */ public static function buildAdvanceSetting(&$form) { + $entityFields = [ + 'cancel_button_text', + 'submit_button_text', + ]; + $form->assign('advancedFieldsConverted', $entityFields); + // should mapping be enabled for this group $form->addElement('checkbox', 'is_map', ts('Enable mapping for this profile?')); @@ -53,8 +59,6 @@ class CRM_UF_Form_AdvanceSetting extends CRM_UF_Form_Group { $form->add('advcheckbox', 'add_cancel_button', ts('Include Cancel Button?')); $form->addElement('text', 'cancel_URL', ts('Cancel Redirect URL'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'cancel_URL')); - $form->addElement('text', 'cancel_button_text', ts('Cancel Button Text'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'cancel_button_text')); - $form->addElement('text', 'submit_button_text', ts('Submit Button Text'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_UFGroup', 'submit_button_text')); // add select for groups $group = array('' => ts('- select -')) + $form->_group; diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php index 475485d293..a1c2d80f47 100644 --- a/CRM/UF/Form/Group.php +++ b/CRM/UF/Form/Group.php @@ -64,7 +64,9 @@ class CRM_UF_Form_Group extends CRM_Core_Form { 'title' => ['name' => 'title'], 'frontend_title' => ['name' => 'frontend_title'], 'description' => ['name' => 'description', 'help' => ['id' => 'id-description', 'file' => 'CRM/UF/Form/Group.hlp']], - 'uf_group_type' => ['name' => 'uf_group_type', 'not-auto-addable' => TRUE, 'help' => ['id' => 'id-used_for', 'file' => 'CRM/UF/Form/Group.hlp'], 'post_html_text' => ' ' . $this->getOtherModuleString()] + 'uf_group_type' => ['name' => 'uf_group_type', 'not-auto-addable' => TRUE, 'help' => ['id' => 'id-used_for', 'file' => 'CRM/UF/Form/Group.hlp'], 'post_html_text' => ' ' . $this->getOtherModuleString()], + 'cancel_button_text' => ['name' => 'cancel_button_text', 'help' => ['id' => 'id-cancel_button_text', 'file' => 'CRM/UF/Form/Group.hlp'], 'class' => 'cancel_button_section'], + 'submit_button_text' => ['name' => 'submit_button_text', 'help' => ['id' => 'id-submit_button_text', 'file' => 'CRM/UF/Form/Group.hlp'], 'class' => ''], ]; } diff --git a/templates/CRM/UF/Form/AdvanceSetting.tpl b/templates/CRM/UF/Form/AdvanceSetting.tpl index c2ba1ecf63..dcef516824 100644 --- a/templates/CRM/UF/Form/AdvanceSetting.tpl +++ b/templates/CRM/UF/Form/AdvanceSetting.tpl @@ -60,15 +60,12 @@ {$form.cancel_URL.html} {help id='id-cancel_URL' file="CRM/UF/Form/Group.hlp"} - - {$form.cancel_button_text.label} - {$form.cancel_button_text.html} {help id='id-cancel_button_text' file="CRM/UF/Form/Group.hlp"} - - - - {$form.submit_button_text.label} - {$form.submit_button_text.html} {help id='id-submit_button_text' file="CRM/UF/Form/Group.hlp"} - + {foreach from=$advancedFieldsConverted item=fieldName} + {assign var=fieldSpec value=$entityFields.$fieldName} + + {include file="CRM/Core/Form/Field.tpl"} + + {/foreach} diff --git a/templates/CRM/UF/Form/Group.tpl b/templates/CRM/UF/Form/Group.tpl index 698e71e05d..7e96dd6f64 100644 --- a/templates/CRM/UF/Form/Group.tpl +++ b/templates/CRM/UF/Form/Group.tpl @@ -47,10 +47,12 @@ {else} {foreach from=$entityFields item=fieldSpec} - {assign var=fieldName value=$fieldSpec.name} - - {include file="CRM/Core/Form/Field.tpl"} - + {if not in_array($fieldSpec.name, $advancedFieldsConverted)} + {assign var=fieldName value=$fieldSpec.name} + + {include file="CRM/Core/Form/Field.tpl"} + + {/if} {/foreach} diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml index 4057e3bd9f..cafe160ac6 100644 --- a/xml/schema/Core/UFGroup.xml +++ b/xml/schema/Core/UFGroup.xml @@ -281,6 +281,9 @@ NULLtrue4.7 + + Text + submit_button_text @@ -291,6 +294,9 @@ NULL true 4.7 + + Text + add_cancel_button -- 2.25.1
{$form.weight.label}{if $config->userSystem->is_drupal EQ '1'} {help id='id-profile_weight' file="CRM/UF/Form/Group.hlp"}{/if}