Merge branch 'MDL-71661' of https://github.com/paulholden/moodle

moodle · Jun 3, 2021 · 1edd0ac · 1edd0ac
2 parents c5a08d8 + 42a59cb
commit 1edd0ac
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 23 deletions.
diff --git a/cohort/locallib.php b/cohort/locallib.php
@@ -36,6 +36,7 @@ class cohort_candidate_selector extends user_selector_base {
 
     public function __construct($name, $options) {
         $this->cohortid = $options['cohortid'];
+        $options['includecustomfields'] = true;
         parent::__construct($name, $options);
     }
 
@@ -46,18 +47,22 @@ public function __construct($name, $options) {
      */
     public function find_users($search) {
         global $DB;
+
         // By default wherecondition retrieves all users except the deleted, not confirmed and guest.
         list($wherecondition, $params) = $this->search_sql($search, 'u');
+        $params = array_merge($params, $this->userfieldsparams);
+
         $params['cohortid'] = $this->cohortid;
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('u');
+        $fields      = 'SELECT u.id, ' . $this->userfieldsselects;
         $countfields = 'SELECT COUNT(1)';
 
         $sql = " FROM {user} u
             LEFT JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
+                $this->userfieldsjoin
                 WHERE cm.id IS NULL AND $wherecondition";
 
-        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
+        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $order = ' ORDER BY ' . $sort;
 
         if (!$this->is_validating()) {
@@ -100,6 +105,7 @@ class cohort_existing_selector extends user_selector_base {
 
     public function __construct($name, $options) {
         $this->cohortid = $options['cohortid'];
+        $options['includecustomfields'] = true;
         parent::__construct($name, $options);
     }
 
@@ -110,18 +116,22 @@ public function __construct($name, $options) {
      */
     public function find_users($search) {
         global $DB;
+
         // By default wherecondition retrieves all users except the deleted, not confirmed and guest.
         list($wherecondition, $params) = $this->search_sql($search, 'u');
+        $params = array_merge($params, $this->userfieldsparams);
+
         $params['cohortid'] = $this->cohortid;
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('u');
+        $fields      = 'SELECT u.id, ' . $this->userfieldsselects;
         $countfields = 'SELECT COUNT(1)';
 
         $sql = " FROM {user} u
                  JOIN {cohort_members} cm ON (cm.userid = u.id AND cm.cohortid = :cohortid)
+                 $this->userfieldsjoin
                 WHERE $wherecondition";
 
-        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
+        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $order = ' ORDER BY ' . $sort;
 
         if (!$this->is_validating()) {

diff --git a/cohort/tests/behat/add_cohort.feature b/cohort/tests/behat/add_cohort.feature
@@ -5,29 +5,34 @@ Feature: Add cohorts of users
   I need to create cohorts and add users on them
 
   Background:
-    Given the following "users" exist:
-      | username | firstname | lastname | email |
-      | user1 | First | User | first@example.com |
-      | user2 | Second | User | second@example.com |
-      | user3 | Third | User | third@example.com |
-      | user4 | Forth | User | forth@example.com |
+    Given the following "custom profile fields" exist:
+      | datatype | shortname | name  |
+      | text     | fruit     | Fruit |
+    And the following "users" exist:
+      | username | firstname | lastname | email              | profile_field_fruit |
+      | user1    | First     | User     | first@example.com  | Apple               |
+      | user2    | Second    | User     | second@example.com | Banana              |
+      | user3    | Third     | User     | third@example.com  | Apple               |
+      | user4    | Forth     | User     | forth@example.com  | Pear                |
+    And the following "cohort" exists:
+      | name        | Test cohort name        |
+      | idnumber    | 333                     |
+      | description | Test cohort description |
     And I log in as "admin"
-    And I navigate to "Users > Accounts >Cohorts" in site administration
-    And I follow "Add new cohort"
-    And I set the following fields to these values:
-      | Name | Test cohort name |
-      | Context | System |
-      | Cohort ID | 333 |
-      | Description | Test cohort description |
-    And I press "Save changes"
+    And I navigate to "Users > Accounts > Cohorts" in site administration
 
   @javascript
   Scenario: Add a cohort
-    When I follow "Cohorts"
-    Then I should see "Test cohort name"
-    And I should see "333"
-    And I should see "Test cohort description"
-    And I should see "Created manually"
+    When I follow "Add new cohort"
+    And I set the following fields to these values:
+      | Name        | My new cohort         |
+      | Context     | System                |
+      | Cohort ID   | mynewcohort           |
+      | Description | My new cohort is cool |
+    And I press "Save changes"
+    Then the following should exist in the "generaltable" table:
+      | Name          | Cohort ID   | Description           |
+      | My new cohort | mynewcohort | My new cohort is cool |
 
   @javascript
   Scenario: Add users to a cohort selecting them from the system users list
@@ -39,6 +44,36 @@ Feature: Add cohorts of users
     And the "Current users" select box should contain "Second User (second@example.com)"
     And the "Current users" select box should not contain "Forth User (forth@example.com)"
 
+  @javascript
+  Scenario: Add user to cohort using custom user field search
+    Given the following config values are set as admin:
+      | showuseridentity | email,profile_field_fruit |
+    When I click on "Assign" "link" in the "Test cohort name" "table_row"
+    And I set the field "addselect_searchtext" to "Apple"
+    And I wait "1" seconds
+    Then the "Potential users" select box should contain "First User (first@example.com\, Apple)"
+    And the "Potential users" select box should not contain "Second User (second@example.com\, Banana)"
+    And the "Potential users" select box should not contain "Forth User (forth@example.com\, Pear)"
+    And I set the field "Potential users" to "Third User (third@example.com\, Apple)"
+    And I press "Add"
+    And the "Current users" select box should contain "Third User (third@example.com\, Apple)"
+
+  @javascript
+  Scenario: Remove user from cohort using custom user field search
+    Given the following config values are set as admin:
+      | showuseridentity | email,profile_field_fruit |
+    And the following "cohort members" exist:
+      | cohort | user  |
+      | 333    | user1 |
+      | 333    | user2 |
+    When I click on "Assign" "link" in the "Test cohort name" "table_row"
+    And I set the field "removeselect_searchtext" to "Apple"
+    And I wait "1" seconds
+    Then the "Current users" select box should not contain "Second User (second@example.com\, Banana)"
+    And I set the field "Current users" to "First User (first@example.com\, Apple)"
+    And I press "Remove"
+    And the "Potential users" select box should contain "First User (first@example.com\, Apple)"
+
   @javascript
   Scenario: Add users to a cohort using a bulk user action
     When I follow "Accounts"