Commit 5c7ff29d authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1871280: Using correct search with 'Groups I am in' during pagination 



Change-Id: I7f2f80c350ba45dfdf2953eac193188c57f27c2c
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit a357f8cc)
parent 2b42c3b2

htdocs/group/index.json.php

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ $searchmode = 'find'; 


// check that the filter is valid, if not default to 'all'

if (in_array($filter, array('allmy', 'member', 'admin', 'invite', 'notmember', 'canjoin'))) {

    if ($filter == 'allmy' || $filter == 'admin' || $filter == 'invite') {

    if ($filter == 'allmy' || $filter == 'admin' || $filter == 'member' || $filter == 'invite') {

        $searchmode = 'mygroups';

    }

    $type = $filter;

test/behat/features/user_content/some_html.feature

+2 −1
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ Scenario: 
    And I should not see "<h1>Mahara does HTML</h1>"

    And I should see images within the block "Some HTML"

    And I follow "mahara manual"

    And I wait "3" seconds

    And I switch to the new window

    And I wait "2" seconds

    Then I should see "This is the manual for Mahara"