smart-group-changes

diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php
index b175d8f076837c9f2b61b7d62fb876fd12b589dd..cf83c707c69f59b94f6534dd584f62cc41f565c7 100644 (file)
--- a/CRM/Contact/Task.php
+++ b/CRM/Contact/Task.php
@@ -118,12 +118,12 @@ class CRM_Contact_Task {
           'class' => 'CRM_Activity_Form_Activity',
         ),
         self::SAVE_SEARCH => array(
-          'title' => ts('Smart group - create'),
+          'title' => ts('Group - create smart group'),
           'class' => 'CRM_Contact_Form_Task_SaveSearch',
           'result' => TRUE,
         ),
         self::SAVE_SEARCH_UPDATE => array(
-          'title' => ts('Smart group - update'),
+          'title' => ts('Group - update smart group'),
           'class' => 'CRM_Contact_Form_Task_SaveSearch_Update',
           'result' => TRUE,
         ),

diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php
index 0d674fde9d30aedb8029673476c52f8f6beff21f..a69141d5e251c921627183b325507b955c020bc3 100644 (file)
--- a/CRM/Event/Task.php
+++ b/CRM/Event/Task.php
@@ -106,12 +106,12 @@ class CRM_Event_Task {
           'result' => TRUE,
         ),
         13 => array(
-          'title' => ts('Smart group - create'),
+          'title' => ts('Group - create smart group'),
           'class' => 'CRM_Event_Form_Task_SaveSearch',
           'result' => TRUE,
         ),
         14 => array(
-          'title' => ts('Smart group - update'),
+          'title' => ts('Group - update smart group'),
           'class' => 'CRM_Event_Form_Task_SaveSearch_Update',
           'result' => TRUE,
         ),

diff --git a/templates/CRM/Contact/Form/Search/Advanced.hlp b/templates/CRM/Contact/Form/Search/Advanced.hlp
index 6bec466fe3caaf531ff1ec9737349531707dcbce..5e5d9e5ae3f3678910bcf37b919782c29bccdea6 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Advanced.hlp
+++ b/templates/CRM/Contact/Form/Search/Advanced.hlp
@@ -35,7 +35,7 @@
 {ts}Smart Group{/ts}
 {/htxt}
 {htxt id='id-advanced-smart'}
-    <p>{ts}If you've changed search criteria for this 'smart group' and want to save your changes, select <strong>Smart group - update</strong> from the '- more actions -' drop-down menu, and then click Go.{/ts}</p>
+    <p>{ts}If you've changed search criteria for this 'smart group' and want to save your changes, select <strong>Group - update smart group</strong> from the '- more actions -' drop-down menu{/ts}</p>
 {/htxt}
 
 {htxt id="id-privacy-title"}

diff --git a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
index 464f5ba27ca8ef0d43d8a64b9c0127284a2870ec..09874f99ed68fe248f95e47bdb47db10f1720e6a 100755 (executable)
--- a/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
+++ b/tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
@@ -107,7 +107,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->type("first_name", $firstName);
     $this->type("last_name", $lastName);
     $this->click("edit-submit");
-    $this->waitForPageToLoad($this->getTimeoutMsec());
+    $this->Batch Update Participants Via PrwaitForPageToLoad($this->getTimeoutMsec());
     $permissions = array("edit-{$roleId}-access-civicrm");
     $this->changePermissions($permissions);
 
@@ -140,7 +140,7 @@ class WebTest_ACL_AssignUsersToRolesTest extends CiviSeleniumTestCase {
     $this->waitForElementPresent("task");
     $this->click('radio_ts', 'ts_all');
     $this->click('task');
-    $this->select('task', 'label=Smart group - create');
+    $this->select('task', 'label=Group - create smart group');
     $this->waitForPageToLoad($this->getTimeoutMsec());
     $smartGroupTitle = "SmartGroup" . substr(sha1(rand()), 0, 4);
     $this->type("title", $smartGroupTitle);