From b581842fe3332c54a5baa614972b421656006dec Mon Sep 17 00:00:00 2001 From: joannechester Date: Wed, 14 Oct 2015 10:44:04 +1100 Subject: [PATCH] renaming-batch-update --- CRM/Activity/Form/Task/Batch.php | 4 ++-- CRM/Activity/Form/Task/PickProfile.php | 6 +++--- CRM/Activity/Task.php | 2 +- CRM/Contact/Form/Task/Batch.php | 4 ++-- CRM/Contact/Form/Task/PickProfile.php | 10 +++++----- CRM/Contact/Task.php | 2 +- CRM/Contribute/Form/Task/Batch.php | 6 +++--- CRM/Contribute/Form/Task/PickProfile.php | 6 +++--- CRM/Contribute/Task.php | 2 +- CRM/Core/BAO/UFGroup.php | 4 ++-- CRM/Event/Form/Task/Batch.php | 2 +- CRM/Event/Form/Task/PickProfile.php | 6 +++--- CRM/Event/Task.php | 4 ++-- CRM/Member/Form/Task/Batch.php | 6 +++--- CRM/Member/Form/Task/PickProfile.php | 6 +++--- CRM/Member/Task.php | 2 +- templates/CRM/Activity/Form/Task/Batch.tpl | 1 - templates/CRM/Contact/Form/Task/PickProfile.tpl | 2 +- templates/CRM/Contribute/Form/Task/Batch.tpl | 1 - templates/CRM/Event/Form/Task/PickProfile.tpl | 1 - tests/phpunit/CRM/Contribute/BAO/ContributionTest.php | 4 ++-- tests/phpunit/CRM/Member/BAO/MembershipTest.php | 2 +- .../phpunit/WebTest/Event/ChangeParticipantStatus.php | 2 +- tests/phpunit/WebTest/Profile/BatchUpdateTest.php | 6 +++--- 24 files changed, 44 insertions(+), 47 deletions(-) diff --git a/CRM/Activity/Form/Task/Batch.php b/CRM/Activity/Form/Task/Batch.php index 0793f97c87..85648c159a 100755 --- a/CRM/Activity/Form/Task/Batch.php +++ b/CRM/Activity/Form/Task/Batch.php @@ -99,7 +99,7 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task { if (!$ufGroupId) { CRM_Core_Error::fatal('ufGroupId is missing'); } - $this->_title = ts('Batch Update for Activities') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); + $this->_title = ts('Update multiple activities') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); CRM_Utils_System::setTitle($this->_title); $this->addDefaultButtons(ts('Save')); @@ -184,7 +184,7 @@ class CRM_Activity_Form_Task_Batch extends CRM_Activity_Form_Task { // $buttonName = $this->controller->getButtonName('submit'); if ($suppressFields) { - CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Batch Update."), ts('Some Fields Excluded'), 'info'); + CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Update multiple activities."), ts('Some Fields Excluded'), 'info'); } $this->addDefaultButtons(ts('Update Activities')); diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php index cd3076865d..2cd3a5a0d3 100755 --- a/CRM/Activity/Form/Task/PickProfile.php +++ b/CRM/Activity/Form/Task/PickProfile.php @@ -65,12 +65,12 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); - CRM_Utils_System::setTitle(ts('Batch Profile Update for Activities')); + CRM_Utils_System::setTitle(ts('Update multiple activities')); $validate = FALSE; //validations if (count($this->_activityHolderIds) > $this->_maxActivities) { - CRM_Core_Session::setStatus(ts("The maximum number of Activities you can select for Batch update is %1. You have selected %2. Please select fewer Activities from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of activities you can select for Update multiple activities is %1. You have selected %2. Please select fewer Activities from your search results and try again.", array( 1 => $this->_maxActivities, 2 => count($this->_activityHolderIds), )), ts('Maximum Exceeded'), 'error'); @@ -112,7 +112,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { } if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update activities via profile. Navigate to Administer > Customize Data and Screens > Profiles to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts("No Profile Configured"), "alert"); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Update multiple activities. Navigate to Administer > Customize Data and Screens > Profiles to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts("No Profile Configured"), "alert"); CRM_Utils_System::redirect($this->_userContext); } elseif ($notEditable) { diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php index 0fe4d5f249..48f99a52b5 100644 --- a/CRM/Activity/Task.php +++ b/CRM/Activity/Task.php @@ -86,7 +86,7 @@ class CRM_Activity_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch update activities via profile'), + 'title' => ts('Update multiple activities'), 'class' => array( 'CRM_Activity_Form_Task_PickProfile', 'CRM_Activity_Form_Task_Batch', diff --git a/CRM/Contact/Form/Task/Batch.php b/CRM/Contact/Form/Task/Batch.php index 66de385ece..15d81fa0b6 100644 --- a/CRM/Contact/Form/Task/Batch.php +++ b/CRM/Contact/Form/Task/Batch.php @@ -80,7 +80,7 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task { if (!$ufGroupId) { CRM_Core_Error::fatal('ufGroupId is missing'); } - $this->_title = ts('Batch Update') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); + $this->_title = ts('Update multiple contacts') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); CRM_Utils_System::setTitle($this->_title); $this->addDefaultButtons(ts('Save')); @@ -147,7 +147,7 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task { $buttonName = $this->controller->getButtonName('submit'); if ($suppressFields && $buttonName != '_qf_BatchUpdateProfile_next') { - CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Batch Update."), ts('Some Fields Excluded'), 'info'); + CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Update multiple contacts."), ts('Some Fields Excluded'), 'info'); } $this->addDefaultButtons(ts('Update Contacts')); diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php index 8aedb2ed2b..9c5c46736e 100644 --- a/CRM/Contact/Form/Task/PickProfile.php +++ b/CRM/Contact/Form/Task/PickProfile.php @@ -71,7 +71,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { $validate = FALSE; //validations if (count($this->_contactIds) > $this->_maxContacts) { - CRM_Core_Session::setStatus(ts("The maximum number of contacts you can select for Batch update is %1. You have selected %2. Please select fewer contacts from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of contacts you can select for Update multiple contacts is %1. You have selected %2. Please select fewer contacts from your search results and try again.", array( 1 => $this->_maxContacts, 2 => count($this->_contactIds), )), ts('Maximum Exceeded'), 'error'); @@ -79,7 +79,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { } if (CRM_Contact_BAO_Contact_Utils::checkContactType($this->_contactIds)) { - CRM_Core_Session::setStatus(ts("Batch update requires that all selected contacts be the same basic type (e.g. all Individuals OR all Organizations...). Please modify your selection and try again."), ts('Contact Type Mismatch'), 'error'); + CRM_Core_Session::setStatus(ts("Update multiple contacts requires that all selected contacts be the same basic type (e.g. all Individuals OR all Organizations...). Please modify your selection and try again."), ts('Contact Type Mismatch'), 'error'); $validate = TRUE; } @@ -93,7 +93,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { * Build the form object. */ public function buildQuickForm() { - CRM_Utils_System::setTitle(ts('Batch Profile Update for Contact')); + CRM_Utils_System::setTitle(ts('Update multiple contacts')); foreach ($this->_contactIds as $id) { $this->_contactTypes = CRM_Contact_BAO_Contact::getContactTypes($id); @@ -106,7 +106,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { if (empty($profiles)) { $types = implode(' ' . ts('or') . ' ', $this->_contactTypes); - CRM_Core_Session::setStatus(ts("The contact type selected for Batch update does not have a corresponding profile. Please set up a profile for %1s and try again.", array(1 => $types)), ts('No Profile Available'), 'error'); + CRM_Core_Session::setStatus(ts("The contact type selected for Update multiple contacts does not have a corresponding profile. Please set up a profile for %1s and try again.", array(1 => $types)), ts('No Profile Available'), 'error'); CRM_Utils_System::redirect($this->_userContext); } $ufGroupElement = $this->add('select', 'uf_group_id', ts('Select Profile'), array('' => ts('- select profile -')) + $profiles, TRUE, array('class' => 'crm-select2 huge')); @@ -132,7 +132,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { */ public static function formRule($fields) { if (CRM_Core_BAO_UFField::checkProfileType($fields['uf_group_id'])) { - $errorMsg['uf_group_id'] = "You cannot select mix profile for batch update."; + $errorMsg['uf_group_id'] = "You cannot select a mixed profile for Update multiple contacts."; } if (!empty($errorMsg)) { diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index cf83c707c6..fd59b3d62d 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -138,7 +138,7 @@ class CRM_Contact_Task { 'result' => TRUE, ), self::BATCH_UPDATE => array( - 'title' => ts('Batch update contacts via profile'), + 'title' => ts('Update multiple contacts'), 'class' => array( 'CRM_Contact_Form_Task_PickProfile', 'CRM_Contact_Form_Task_Batch', diff --git a/CRM/Contribute/Form/Task/Batch.php b/CRM/Contribute/Form/Task/Batch.php index 1832a45950..fcd34a23e2 100644 --- a/CRM/Contribute/Form/Task/Batch.php +++ b/CRM/Contribute/Form/Task/Batch.php @@ -85,7 +85,7 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { if (!$ufGroupId) { CRM_Core_Error::fatal('ufGroupId is missing'); } - $this->_title = ts('Batch Update for Contributions') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); + $this->_title = ts('Update multiple contributions') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); CRM_Utils_System::setTitle($this->_title); $this->addDefaultButtons(ts('Save')); @@ -104,7 +104,7 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { } //fix to reduce size as we are using this field in grid - if (is_array($field['attributes']) && $this->_fields[$name]['attributes']['size'] > 19) { + if (is_array($field['attributes']) && !empty($this->_fields[$name]['attributes']['size']) && $this->_fields[$name]['attributes']['size'] > 19) { //shrink class to "form-text-medium" $this->_fields[$name]['attributes']['size'] = 19; } @@ -170,7 +170,7 @@ class CRM_Contribute_Form_Task_Batch extends CRM_Contribute_Form_Task { $buttonName = $this->controller->getButtonName('submit'); if ($suppressFields && $buttonName != '_qf_Batch_next') { - CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Batch Update."), ts('Unsupported Field Type'), 'error'); + CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Update multiple contributions."), ts('Unsupported Field Type'), 'error'); } $this->addDefaultButtons(ts('Update Contributions')); diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php index 97e364987f..7654b3064e 100644 --- a/CRM/Contribute/Form/Task/PickProfile.php +++ b/CRM/Contribute/Form/Task/PickProfile.php @@ -62,12 +62,12 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task { $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); - CRM_Utils_System::setTitle(ts('Batch Update Contributions Via Profile')); + CRM_Utils_System::setTitle(ts('Update multiple contributions')); $validate = FALSE; //validations if (count($this->_contributionIds) > $this->_maxContributions) { - CRM_Core_Session::setStatus(ts("The maximum number of contributions you can select for Batch update is %1. You have selected %2. Please select fewer contributions from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of contributions you can select for Update multiple contributions is %1. You have selected %2. Please select fewer contributions from your search results and try again.", array( 1 => $this->_maxContributions, 2 => count($this->_contributionIds), )), ts('Batch Update Error'), 'error'); @@ -89,7 +89,7 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task { $profiles = CRM_Core_BAO_UFGroup::getProfiles($types, TRUE); if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update contributions via profile. Navigate to Administer CiviCRM > Customize Data and Screens > CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Profile Required'), 'error'); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Update multiple contributions. Navigate to Administer CiviCRM > Customize Data and Screens > CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Profile Required'), 'error'); CRM_Utils_System::redirect($this->_userContext); } diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index b48240fc85..8de48e139d 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -82,7 +82,7 @@ class CRM_Contribute_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch update contributions via profile'), + 'title' => ts('Update multiple contributions'), 'class' => array( 'CRM_Contribute_Form_Task_PickProfile', 'CRM_Contribute_Form_Task_Batch', diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index 08a8dc3850..97951229a7 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -2313,7 +2313,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * @param array $defaults * Defaults array. * @param bool $singleProfile - * True for single profile else false(batch update). + * True for single profile else false(Update multiple items). * @param int $componentId * Id for specific components like contribute, event etc. * @param null $component @@ -2335,7 +2335,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) continue; } - //set the field name depending upon the profile mode(single/batch) + //set the field name depending upon the profile mode(single/multiple) if ($singleProfile) { $fldName = $name; } diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php index 6acd8c742a..b730c19d58 100644 --- a/CRM/Event/Form/Task/Batch.php +++ b/CRM/Event/Form/Task/Batch.php @@ -100,7 +100,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task { CRM_Core_Error::fatal('ufGroupId is missing'); } - $this->_title = ts('Batch Update for Events') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); + $this->_title = ts('Update multiple participants') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); CRM_Utils_System::setTitle($this->_title); $this->addDefaultButtons(ts('Save')); $this->_fields = array(); diff --git a/CRM/Event/Form/Task/PickProfile.php b/CRM/Event/Form/Task/PickProfile.php index f312d8f2d2..57b7fea045 100644 --- a/CRM/Event/Form/Task/PickProfile.php +++ b/CRM/Event/Form/Task/PickProfile.php @@ -67,12 +67,12 @@ class CRM_Event_Form_Task_PickProfile extends CRM_Event_Form_Task { $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); - CRM_Utils_System::setTitle(ts('Batch Update for Event Participants')); + CRM_Utils_System::setTitle(ts('Update multiple participants')); $validate = FALSE; //validations if (count($this->_participantIds) > $this->_maxParticipations) { - CRM_Core_Session::setStatus("The maximum number of event participations you can select for Batch Update is {$this->_maxParticipations}. You have selected " . count($this->_participantIds) . ". Please select fewer participantions from your search results and try again."); + CRM_Core_Session::setStatus("The maximum number of records you can select for Update multiple participants is {$this->_maxParticipations}. You have selected " . count($this->_participantIds) . ". Please select fewer participantions from your search results and try again."); $validate = TRUE; } @@ -93,7 +93,7 @@ class CRM_Event_Form_Task_PickProfile extends CRM_Event_Form_Task { $profiles = CRM_Core_BAO_UFGroup::getProfiles($types, TRUE); if (empty($profiles)) { - CRM_Core_Session::setStatus("To use Batch Update for event participants, you need to configure a profile containing only Participant fields (e.g. Participant Status, Participant Role, etc.). Configure a profile at 'Administer CiviCRM >> Customize >> CiviCRM Profile'."); + CRM_Core_Session::setStatus("To use Update multiple participants, you need to configure a profile containing only Participant fields (e.g. Participant Status, Participant Role, etc.). Configure a profile at 'Administer CiviCRM >> Customize >> CiviCRM Profile'."); CRM_Utils_System::redirect($this->_userContext); } diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php index a69141d5e2..c03a2fa47e 100644 --- a/CRM/Event/Task.php +++ b/CRM/Event/Task.php @@ -88,7 +88,7 @@ class CRM_Event_Task { 'result' => FALSE, ), 4 => array( - 'title' => ts('Batch update participants via profile'), + 'title' => ts('Update multiple participants'), 'class' => array( 'CRM_Event_Form_Task_PickProfile', 'CRM_Event_Form_Task_Batch', @@ -116,7 +116,7 @@ class CRM_Event_Task { 'result' => TRUE, ), 15 => array( - 'title' => ts('Participant status - change'), + 'title' => ts('Participant status - change (emails sent)'), 'class' => 'CRM_Event_Form_Task_ParticipantStatus', 'result' => TRUE, ), diff --git a/CRM/Member/Form/Task/Batch.php b/CRM/Member/Form/Task/Batch.php index b182f4f49e..9424dd5298 100644 --- a/CRM/Member/Form/Task/Batch.php +++ b/CRM/Member/Form/Task/Batch.php @@ -92,7 +92,7 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task { if (!$ufGroupId) { CRM_Core_Error::fatal('ufGroupId is missing'); } - $this->_title = ts('Batch Update for Members') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); + $this->_title = ts('Update multiple memberships') . ' - ' . CRM_Core_BAO_UFGroup::getTitle($ufGroupId); CRM_Utils_System::setTitle($this->_title); $this->addDefaultButtons(ts('Save')); @@ -111,7 +111,7 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task { } //fix to reduce size as we are using this field in grid - if (is_array($field['attributes']) && $this->_fields[$name]['attributes']['size'] > 19) { + if (is_array($field['attributes']) && !empty($this->_fields[$name]['attributes']['size']) && $this->_fields[$name]['attributes']['size'] > 19) { //shrink class to "form-text-medium" $this->_fields[$name]['attributes']['size'] = 19; } @@ -176,7 +176,7 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task { $buttonName = $this->controller->getButtonName('submit'); if ($suppressFields && $buttonName != '_qf_Batch_next') { - CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Batch Update."), ts('Unsupported Field Type'), 'error'); + CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Update multiple memberships."), ts('Unsupported Field Type'), 'error'); } $this->addDefaultButtons(ts('Update Memberships')); diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php index d9cb9f87f9..6721d09722 100644 --- a/CRM/Member/Form/Task/PickProfile.php +++ b/CRM/Member/Form/Task/PickProfile.php @@ -66,12 +66,12 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task { $session = CRM_Core_Session::singleton(); $this->_userContext = $session->readUserContext(); - CRM_Utils_System::setTitle(ts('Batch Profile Update for Membership')); + CRM_Utils_System::setTitle(ts('Update multiple memberships')); $validate = FALSE; //validations if (count($this->_memberIds) > $this->_maxMembers) { - CRM_Core_Session::setStatus(ts("The maximum number of members you can select for Batch update is %1. You have selected %2. Please select fewer members from your search results and try again.", array( + CRM_Core_Session::setStatus(ts("The maximum number of members you can select for Update multiple memberships is %1. You have selected %2. Please select fewer members from your search results and try again.", array( 1 => $this->_maxMembers, 2 => count($this->_memberIds), )), ts('Batch Update Error'), 'error'); @@ -95,7 +95,7 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task { $profiles = CRM_Core_BAO_UFGroup::getProfiles($types, TRUE); if (empty($profiles)) { - CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Batch update memberships via profile. Navigate to Administer CiviCRM >> CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Batch Update Error'), 'error'); + CRM_Core_Session::setStatus(ts("You will need to create a Profile containing the %1 fields you want to edit before you can use Update multiple memberships. Navigate to Administer CiviCRM >> CiviCRM Profile to configure a Profile. Consult the online Administrator documentation for more information.", array(1 => $types[0])), ts('Batch Update Error'), 'error'); CRM_Utils_System::redirect($this->_userContext); } diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php index a317c87e14..62d91ce1fc 100644 --- a/CRM/Member/Task.php +++ b/CRM/Member/Task.php @@ -90,7 +90,7 @@ class CRM_Member_Task { 'result' => TRUE, ), 5 => array( - 'title' => ts('Batch update memberships via profile'), + 'title' => ts('Update multiple memberships'), 'class' => array( 'CRM_Member_Form_Task_PickProfile', 'CRM_Member_Form_Task_Batch', diff --git a/templates/CRM/Activity/Form/Task/Batch.tpl b/templates/CRM/Activity/Form/Task/Batch.tpl index 4180cac04b..6123a3d75c 100755 --- a/templates/CRM/Activity/Form/Task/Batch.tpl +++ b/templates/CRM/Activity/Form/Task/Batch.tpl @@ -28,7 +28,6 @@
{ts}Update field values for each Activities as needed. Click Update Activities below to save all your changes. To set a field to the same value for ALL rows, enter that value for the first Activity and then click the Copy icon (next to the column title).{/ts}
- {$profileTitle}
{if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contact/Form/Task/PickProfile.tpl b/templates/CRM/Contact/Form/Task/PickProfile.tpl index a0309d9ed9..0453786e18 100644 --- a/templates/CRM/Contact/Form/Task/PickProfile.tpl +++ b/templates/CRM/Contact/Form/Task/PickProfile.tpl @@ -23,7 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{*Batch update for contact via profile*} +{*Update multiple contacts*}
diff --git a/templates/CRM/Contribute/Form/Task/Batch.tpl b/templates/CRM/Contribute/Form/Task/Batch.tpl index 8f563d48a3..8d4c166517 100644 --- a/templates/CRM/Contribute/Form/Task/Batch.tpl +++ b/templates/CRM/Contribute/Form/Task/Batch.tpl @@ -28,7 +28,6 @@
{ts}Update field values for each contribution as needed. Click Update Contributions below to save all your changes. To set a field to the same value for ALL rows, enter that value for the first contribution and then click the Copy icon (next to the column title).{/ts}
- {$profileTitle}
diff --git a/templates/CRM/Event/Form/Task/PickProfile.tpl b/templates/CRM/Event/Form/Task/PickProfile.tpl index 0c4379ed1c..0bc8340e3e 100644 --- a/templates/CRM/Event/Form/Task/PickProfile.tpl +++ b/templates/CRM/Event/Form/Task/PickProfile.tpl @@ -24,7 +24,6 @@ +--------------------------------------------------------------------+ *}
- {ts}Batch Update Event via Profile{/ts}
diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php index 50bcb44869..fe0109ab89 100644 --- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php +++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php @@ -290,7 +290,7 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase { /** * Display sort name during. - * contribution batch update through profile + * Update multiple contributions * sortName(); */ public function testsortName() { @@ -333,7 +333,7 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase { $this->assertEquals($param['trxn_id'], $contribution->trxn_id, 'Check for transcation id creation.'); $this->assertEquals($contactId, $contribution->contact_id, 'Check for contact id creation.'); - //display sort name during batch update + //display sort name during Update multiple contributions $sortName = CRM_Contribute_BAO_Contribution::sortName($contribution->id); $this->assertEquals('Whatson, Shane', $sortName, 'Check for sort name.'); diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php index 58139b3e6a..3b20b5b904 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php @@ -421,7 +421,7 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase { /** * Take sort name of contact during - * batch update member via profile + * Update multiple memberships */ public function testsortName() { $contactId = Contact::createIndividual(); diff --git a/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php b/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php index 47288ea80b..01f830db67 100644 --- a/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php +++ b/tests/phpunit/WebTest/Event/ChangeParticipantStatus.php @@ -68,7 +68,7 @@ class WebTest_Event_ChangeParticipantStatus extends CiviSeleniumTestCase { $this->click($id2); // Change participant status for selected participants - $this->select('task', "label=Participant status - change"); + $this->select('task', "label=Participant status - change (emails sent)"); $this->waitForElementPresent('_qf_ParticipantStatus_next'); $this->select('status_change', "label=Attended"); diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php index fe911eb68f..0a60f9a86d 100644 --- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php +++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php @@ -74,7 +74,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch update contacts via profile"); + $this->select('task', "label=Update multiple contacts"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->waitForElementPresent('uf_group_id'); $this->select('uf_group_id', "label={$profileTitle}"); @@ -156,7 +156,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch update contacts via profile"); + $this->select('task', "label=Update multiple contacts"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->select('uf_group_id', "label={$profileTitle}"); @@ -335,7 +335,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase { $this->waitForElementPresent('CIVICRM_QFID_ts_all_4'); $this->click('CIVICRM_QFID_ts_all_4'); - $this->select('task', "label=Batch update contacts via profile"); + $this->select('task', "label=Update multiple contacts"); $this->waitForElementPresent('_qf_PickProfile_next'); $this->select('uf_group_id', "label={$profileTitle}"); -- 2.25.1
{$form.uf_group_id.label}