CRM-17381-removing-more-batch-updates

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 73f5610b807a7a445740354d51d30be4670105db..68dafe06c2d657abbe34ee8ce9cb323bda882057 100755 (executable)
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -252,7 +252,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
     $buttonName = $this->controller->getButtonName('submit');
 
     if ($suppressFields && $buttonName != '_qf_Entry_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 records."), ts('Some Fields Excluded'), 'info');
     }
   }
 

diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php
index 9c5c46736e47e7eeb43e093f476767ab93a26ea6..78323f4cd557a03ca2b27edad74465c43d1b163f 100644 (file)
--- a/CRM/Contact/Form/Task/PickProfile.php
+++ b/CRM/Contact/Form/Task/PickProfile.php
@@ -32,7 +32,7 @@
  */
 
 /**
- * This class provides the functionality for batch profile update.
+ * This class provides the functionality for Update multiple contacts
  */
 class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task {
 

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 3f67ec505b18aa7945c41cf0d9403d5e2e0ac7ad..7d945f7cc438224483fabeb164f59cad76318945 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2374,7 +2374,7 @@ WHERE  contribution_id = %1 ";
 
       $values['custom_pre_id'] = $custom_pre_id;
       $values['custom_post_id'] = $custom_post_ids;
-      //for tasks 'Change Participant Status' and 'Batch Update Participants Via Profile' case
+      //for tasks 'Change Participant Status' and 'Update multiple Contributions' case
       //and cases involving status updation through ipn
       // whatever that means!
       // total_amount appears to be the preferred input param & it is unclear why we support amount here

diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php
index 7654b3064ecdbb55c63a5f2832efb8317a46e2fa..0f812908fb45607ea131affcef5ac18964fbaf63 100644 (file)
--- a/CRM/Contribute/Form/Task/PickProfile.php
+++ b/CRM/Contribute/Form/Task/PickProfile.php
@@ -70,7 +70,7 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task {
       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');
+          )), ts('Update multiple records error'), 'error');
       $validate = TRUE;
     }
 

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index b730c19d586fbaa351552c784ba1fdabc62f2f8a..8ec5b87497e1d045c87ff56000def7c26ed6de34 100644 (file)
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -221,7 +221,7 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_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'), 'info');
+      CRM_Core_Session::setStatus(ts("File or Autocomplete-Select type field(s) in the selected profile are not supported for Update multiple participants."), ts('Unsupported Field Type'), 'info');
     }
 
     $this->addDefaultButtons(ts('Update Participant(s)'));

diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php
index 6721d0972209fb754372514f0da1c84079908b3c..0920d73e20e5994e27e835b141ad3f2ded89a2d0 100644 (file)
--- a/CRM/Member/Form/Task/PickProfile.php
+++ b/CRM/Member/Form/Task/PickProfile.php
@@ -74,7 +74,7 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task {
       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');
+          )), ts('Update multiple records error'), 'error');
       $validate = TRUE;
     }
 
@@ -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 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_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('Update multiple records error'), 'error');
       CRM_Utils_System::redirect($this->_userContext);
     }
 

diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index d223ef8d3c334d1e4a6ed9ab4382584082d30552..f316db51605af86387f2442ef6f9856da5f9fc88 100644 (file)
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -42,7 +42,6 @@
     {/if}
     <p>{ts}Click <strong>Update Participant(s)</strong> below to save all your changes.{/ts}</p>
 </div>
-    <legend>{$profileTitle}</legend>
         <table class="crm-copy-fields">
        <thead class="sticky">
             <tr class="columnheader">

diff --git a/tests/phpunit/WebTest/Member/BatchUpdateViaProfileTest.php b/tests/phpunit/WebTest/Member/BatchUpdateViaProfileTest.php
index 5fe838d38f71cd8285aa9d7b13e7d51f94b45ed7..770e31f30eabaad52b64553bea345b98835670cd 100644 (file)
--- a/tests/phpunit/WebTest/Member/BatchUpdateViaProfileTest.php
+++ b/tests/phpunit/WebTest/Member/BatchUpdateViaProfileTest.php
@@ -100,11 +100,11 @@ class WebTest_Member_BatchUpdateViaProfileTest extends CiviSeleniumTestCase {
     $this->type('sort_name', $lastName);
     $this->click('_qf_Search_refresh');
 
-    // Batch Update Via Profile
+    // Update multiple memberships
     $this->waitForElementPresent("xpath=//div[@id='search-status']/table/tbody/tr[2]/td[2]/input");
     $this->click("xpath=//div[@id='search-status']/table/tbody/tr[2]/td[2]/input");
     //$this->click('CIVICRM_QFID_ts_all_10');
-    $this->select('task', "label=Batch Update Members Via Profile");
+    $this->select('task', "label=Update multiple memberships");
     $this->waitForElementPresent('_qf_PickProfile_back-bottom');
     $this->waitForElementPresent('uf_group_id');
     $this->select('uf_group_id', "label={$profileTitle}");

diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
index 0a60f9a86d534807cb4ff998caa37aed00ffe48b..ac250c8bf6eab07953410a139af84fe3f913f2e1 100644 (file)
--- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
+++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
@@ -70,7 +70,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
     $this->type('sort_name', "Smiths_x");
     $this->click('_qf_Basic_refresh');
 
-    // Batch Update Via Profile
+    // Update multiple contacts
     $this->waitForElementPresent('CIVICRM_QFID_ts_all_4');
     $this->click('CIVICRM_QFID_ts_all_4');
 
@@ -152,7 +152,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
     $this->type('sort_name', $lastName);
     $this->click('_qf_Basic_refresh');
 
-    // Batch Update Via Profile
+    // Update multiple contacts
     $this->waitForElementPresent('CIVICRM_QFID_ts_all_4');
     $this->click('CIVICRM_QFID_ts_all_4');
 
@@ -331,7 +331,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
     $this->type('sort_name', $lastName);
     $this->click('_qf_Basic_refresh');
 
-    // Batch Update Via Profile
+    // Update multiple contacts
     $this->waitForElementPresent('CIVICRM_QFID_ts_all_4');
     $this->click('CIVICRM_QFID_ts_all_4');