Merge branch 'MDL-59801-master-fix1' of http://github.com/damyon/moodle

rboyatt · Aug 31, 2017 · f33afd1 · f33afd1
2 parents 4bd649d + d29be32
commit f33afd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/tests/behat/behat_forms.php b/lib/tests/behat/behat_forms.php
@@ -532,7 +532,7 @@ public function i_select_from_the_singleselect($option, $singleselect) {
      * @param string $item
      */
     public function i_click_on_item_in_the_autocomplete_list($item) {
-        $xpathtarget = "//ul[@class='form-autocomplete-suggestions']//*[contains(.,'" . $item . "')]";
+        $xpathtarget = "//ul[@class='form-autocomplete-suggestions']//*[contains(concat('|', string(.), '|'),'|" . $item . "|')]";
 
         $this->execute('behat_general::i_click_on', [$xpathtarget, 'xpath_element']);
 

diff --git a/user/renderer.php b/user/renderer.php
@@ -282,11 +282,9 @@ public function unified_filter($course, $context, $filtersapplied) {
 
         // Filter options for role.
         $roleseditable = has_capability('moodle/role:assign', $context);
-        $roles = [];
+        $roles = role_fix_names(get_profile_roles($context), $context, ROLENAME_ALIAS, true);
         if ($roleseditable) {
-            $roles = get_assignable_roles($context, ROLENAME_ALIAS);
-        } else {
-            $roles = role_fix_names(get_profile_roles($context), $context, ROLENAME_ALIAS, true);
+            $roles += get_assignable_roles($context, ROLENAME_ALIAS);
         }
         $criteria = get_string('role');
         $roleoptions = [];