renaming-batch-update

diff --git a/CRM/Activity/Form/Task/Batch.php b/CRM/Activity/Form/Task/Batch.php
index 0793f97c872b4df7daec78ef6d7c53b08290d3cd..85648c159a027d9c2af61def7e35c92c000bd4d6 100755 (executable)
--- 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 cd3076865d1a83745075815c129ef1740e84d3c7..2cd3a5a0d3229b895434520a7261365bbe991bd7 100755 (executable)
--- 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 0fe4d5f249f917aae67360c749c21a4c6b995ce6..48f99a52b5787b1f0ff7313c17a5a9741870ce0a 100644 (file)
--- 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 66de385ecec483e9ed64c2306d2a138542328447..15d81fa0b6e9e1ff0d2f49fa40766949325a87c1 100644 (file)
--- 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 8aedb2ed2b3490d2d511d80bbc378ddb8563e245..9c5c46736e47e7eeb43e093f476767ab93a26ea6 100644 (file)
--- 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 cf83c707c69f59b94f6534dd584f62cc41f565c7..fd59b3d62d61129e03a4b43b666f621fb6c5c708 100644 (file)
--- 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 1832a45950800ca3380ceb6af89c9dcd7afaf3f3..fcd34a23e2e5f8200d1abf137d9f77d2fe9b0125 100644 (file)
--- 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 97e364987fe3719f9fb99f2745ffc34642db0646..7654b3064ecdbb55c63a5f2832efb8317a46e2fa 100644 (file)
--- 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 b48240fc85111d14cbed2af464fbe742d6f09b53..8de48e139dc8d9b51796bd6cf5509e2d23936f02 100644 (file)
--- 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 08a8dc385096ffc0578a9c94fd21ce05cc0c9498..97951229a7065c525094e389e270a5ff3a5df142 100644 (file)
--- 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 6acd8c742a94274f6b62fb5f68f7ea757a8cb5f9..b730c19d586fbaa351552c784ba1fdabc62f2f8a 100644 (file)
--- 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 f312d8f2d2991afb4ca83abb9c4b2776c3d2cb99..57b7fea045708553a5750e29f4909c04b0602092 100644 (file)
--- 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 a69141d5e251c921627183b325507b955c020bc3..c03a2fa47ec559f700f0fc5ec5f66aecb59e1db5 100644 (file)
--- 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 b182f4f49e1d1f79fea4b1af192bdaa677403370..9424dd5298034ebf64637632a467f84ea20e8fb2 100644 (file)
--- 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 d9cb9f87f903b21753b6c7734f484027f68dbc51..6721d0972209fb754372514f0da1c84079908b3c 100644 (file)
--- 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 a317c87e142311e5e02640cb75a89b646685bcca..62d91ce1fc26e8c9a832a4d3d57bd94c9e5bd1b1 100644 (file)
--- 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 4180cac04b0240ce3bac8d1252b1e5ece8c8ea79..6123a3d75c3888edeec7d11b73ba000b4bf76b00 100755 (executable)
--- a/templates/CRM/Activity/Form/Task/Batch.tpl
+++ b/templates/CRM/Activity/Form/Task/Batch.tpl
@@ -28,7 +28,6 @@
 <div id="help">
     {ts}Update field values for each Activities as needed. Click <strong>Update Activities</strong> 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 <strong>Copy icon</strong> (next to the column title).{/ts}
 </div>
-    <legend>{$profileTitle}</legend>
     <div class="crm-submit-buttons">{if $fields}{$form._qf_Batch_refresh.html}{/if}{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
     <table class="crm-copy-fields">
     <thead class="sticky">

diff --git a/templates/CRM/Contact/Form/Task/PickProfile.tpl b/templates/CRM/Contact/Form/Task/PickProfile.tpl
index a0309d9ed96a9af56d6a5546090425e80eb3a135..0453786e1851cf5beec04791d7e23714e31d9c34 100644 (file)
--- 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*}
 <div class="crm-block crm-form-block crm-contact-task-pickprofile-form-block">
  <table class="form-layout-compressed">
     <tr class="crm-contact-task-pickprofile-form-block-uf_group_id">

diff --git a/templates/CRM/Contribute/Form/Task/Batch.tpl b/templates/CRM/Contribute/Form/Task/Batch.tpl
index 8f563d48a3d3c7be7fcfd3a474605c0af9575018..8d4c166517dcb5062b954c2944cc7566f6b9714c 100644 (file)
--- a/templates/CRM/Contribute/Form/Task/Batch.tpl
+++ b/templates/CRM/Contribute/Form/Task/Batch.tpl
@@ -28,7 +28,6 @@
 <div id="help">
     {ts}Update field values for each contribution as needed. Click <strong>Update Contributions</strong> 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 <strong>Copy icon</strong> (next to the column title).{/ts}
 </div>
-    <legend>{$profileTitle}</legend>
     <table class="crm-copy-fields">
     <thead class="sticky">
             <tr class="columnheader">

diff --git a/templates/CRM/Event/Form/Task/PickProfile.tpl b/templates/CRM/Event/Form/Task/PickProfile.tpl
index 0c4379ed1c0682b003596e90830819cef9f1a7eb..0bc8340e3e41374d682dab41d2f98288b39f4ee6 100644 (file)
--- a/templates/CRM/Event/Form/Task/PickProfile.tpl
+++ b/templates/CRM/Event/Form/Task/PickProfile.tpl
@@ -24,7 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-event-pickprofile-form-block">
-    <legend>{ts}Batch Update Event via Profile{/ts}</legend>
     <table class="form-layout">
         <tr class="crm-event-pickprofile-form-block-uf_group_id">
            <td class="label">{$form.uf_group_id.label}</td>

diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
index 50bcb448691a759464452fb6b9bc712f30449cfc..fe0109ab89ee7ac1fe205e42dfc541ccf5fbc05e 100644 (file)
--- 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 58139b3e6ad5ce20147d8cc37aba660232d98a49..3b20b5b904cedeae62f9f9290df2c33984c0727d 100644 (file)
--- 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 47288ea80baa960500bb79038592ff4bdc5329fd..01f830db676af10a39cf0d444da378cd73bc0faf 100644 (file)
--- 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 fe911eb68f2f9fa718ef1a3bc00e1f55bc176bdd..0a60f9a86d534807cb4ff998caa37aed00ffe48b 100644 (file)
--- 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}");