Skip to content

Commit

Permalink
Fixed latet mater changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mhughes2k committed May 12, 2024
2 parents 22d66cc + 9b2b794 commit b28d531
Show file tree
Hide file tree
Showing 268 changed files with 2,738 additions and 814 deletions.
1 change: 1 addition & 0 deletions admin/classes/reportbuilder/local/systemreports/users.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ protected function add_filters(): void {
$entityuseralias = $entityuser->get_table_alias('user');

$filters = [
'user:fullname',
'user:firstname',
'user:lastname',
'user:username',
Expand Down
21 changes: 21 additions & 0 deletions admin/tests/behat/filter_users.feature
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,24 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
And I should not see "User One" in the "reportbuilder-table" "table"
And I should not see "User Three" in the "reportbuilder-table" "table"
And I should not see "User Four" in the "reportbuilder-table" "table"

@javascript
Scenario: Filter users by full name
When I click on "Filters" "button"
And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
| Full name operator | Is equal to |
| Full name value | User One |
And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
Then I should see "User One" in the "reportbuilder-table" "table"
And I should not see "User Two" in the "reportbuilder-table" "table"
And I should not see "User Three" in the "reportbuilder-table" "table"
And I should not see "User Four" in the "reportbuilder-table" "table"
And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
| Full name operator | Is equal to |
| Full name value | User Two |
And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
And I should see "User Two" in the "reportbuilder-table" "table"
And I should not see "User One" in the "reportbuilder-table" "table"
And I should not see "User Three" in the "reportbuilder-table" "table"
And I should not see "User Four" in the "reportbuilder-table" "table"
3 changes: 3 additions & 0 deletions admin/tool/cohortroles/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/customlang/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/dataprivacy/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/log/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_tool_log_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/log/store/database/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/log/store/standard/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/mfa/factor/auth/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@ function xmldb_factor_auth_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/mobile/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/monitor/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/moodlenet/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/policy/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions admin/tool/usertours/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
4 changes: 4 additions & 0 deletions admin/user/user_bulk_forms.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ protected function build_actions(): array {
public function definition() {
$mform =& $this->_form;

// Most bulk actions perform a redirect on selection, so we shouldn't trigger formchange warnings (specifically because
// the user must have _already_ changed the current form by selecting users to perform the action on).
$mform->disable_form_change_checker();

$mform->addElement('hidden', 'returnurl');
$mform->setType('returnurl', PARAM_LOCALURL);

Expand Down
3 changes: 3 additions & 0 deletions auth/cas/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/db/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_db_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/email/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_email_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/ldap/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/lti/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_auth_lti_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/manual/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/mnet/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/none/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_none_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/oauth2/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,8 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
3 changes: 3 additions & 0 deletions auth/shibboleth/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.

// Automatically generated Moodle v4.4.0 release upgrade line.
// Put any upgrade step following this.

return true;
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ M.availability_grade.form.getNode = function(json) {
html += '<option value="' + grade.id + '">' + grade.name + '</option>';
}
html += '</select></span></label> <br><span class="availability-group mb-3">' +
'<label><input type="checkbox" class="form-check-input mx-1" name="min"/>' +
'<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>' +
M.util.get_string('option_min', 'availability_grade') +
'</label> <label><span class="accesshide">' + M.util.get_string('label_min', 'availability_grade') +
'</span><input type="text" class="form-control mx-1" name="minval" title="' +
M.util.get_string('label_min', 'availability_grade') + '"/></label>%</span><br>' +
'<span class="availability-group mb-3">' +
'<label><input type="checkbox" class="form-check-input mx-1" name="max"/>' +
'<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>' +
M.util.get_string('option_max', 'availability_grade') +
'</label> <label><span class="accesshide">' + M.util.get_string('label_max', 'availability_grade') +
'</span><input type="text" class="form-control mx-1" name="maxval" title="' +
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ M.availability_grade.form.getNode = function(json) {
html += '<option value="' + grade.id + '">' + grade.name + '</option>';
}
html += '</select></span></label> <br><span class="availability-group mb-3">' +
'<label><input type="checkbox" class="form-check-input mx-1" name="min"/>' +
'<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>' +
M.util.get_string('option_min', 'availability_grade') +
'</label> <label><span class="accesshide">' + M.util.get_string('label_min', 'availability_grade') +
'</span><input type="text" class="form-control mx-1" name="minval" title="' +
M.util.get_string('label_min', 'availability_grade') + '"/></label>%</span><br>' +
'<span class="availability-group mb-3">' +
'<label><input type="checkbox" class="form-check-input mx-1" name="max"/>' +
'<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>' +
M.util.get_string('option_max', 'availability_grade') +
'</label> <label><span class="accesshide">' + M.util.get_string('label_max', 'availability_grade') +
'</span><input type="text" class="form-control mx-1" name="maxval" title="' +
Expand Down
Loading

0 comments on commit b28d531

Please sign in to comment.