Compare commits

...

975 Commits

Author SHA1 Message Date
Jun Pataleta fdbcfa1b15 Moodle release 4.0.5 2022-11-12 12:55:21 +08:00
Sara Arjona cda2e48134 weekly release 4.0.4+ 2022-11-11 15:01:48 +01:00
Sara Arjona d3b1e4da07 NOBUG: Fixed file access permissions 2022-11-11 15:01:48 +01:00
Jake Dallimore b1bad4dbbc Merge branch 'MDL-76213-400-fix' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-11-11 17:38:27 +08:00
Jun Pataleta 44883e4f32 MDL-76213 mod_assign: Pass correct parameters to override query 2022-11-11 16:12:19 +08:00
Mathew May 6ade6d6060 MDL-71920 libraries: Migrate LTI lib away from pure curl 2022-11-11 12:54:11 +08:00
Mathew May e3ce8c37bd MDL-71920 core: update filelib opt name definition 2022-11-11 12:54:11 +08:00
Adrian Greeve 56a9861094 Merge branch 'MDL-76099-400' of https://github.com/stevandoMoodle/moodle into MOODLE_400_STABLE 2022-11-11 12:24:43 +08:00
Jake Dallimore 6981b82c41 Merge branch 'MDL-75872-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-11 11:45:39 +08:00
Jun Pataleta f5644a9a79 Merge branch 'MDL-76213-400' of https://github.com/Chocolate-lightning/moodle into MOODLE_400_STABLE 2022-11-11 11:34:01 +08:00
Mathew May c110ef6c79 MDL-76213 mod_assign: Improve group override info for teachers 2022-11-11 11:17:03 +08:00
Jun Pataleta 6904a25eb2 Merge branch 'MDL-63037-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-11-11 10:42:19 +08:00
Sara Arjona dee4c975ae Merge branch 'MDL-76253-400' of https://github.com/justusdieckmann/moodle into MOODLE_400_STABLE 2022-11-10 17:17:51 +01:00
Sara Arjona 1c38f5031b Merge branch 'MDL-76070-400' of https://github.com/meirzamoodle/moodle into MOODLE_400_STABLE 2022-11-10 16:56:50 +01:00
Sara Arjona 188de51d23 Merge branch 'MDL-71951-400' of https://github.com/stevandoMoodle/moodle into MOODLE_400_STABLE 2022-11-10 16:37:30 +01:00
Paul Holden bbdb70f1d2 Merge branch 'MDL-75890-400' of https://github.com/meirzamoodle/moodle into MOODLE_400_STABLE 2022-11-10 15:30:25 +00:00
Sara Arjona c91ebee573 Merge branch 'MOODLE_400_MDL-75874' of https://github.com/matheusot/moodle into MOODLE_400_STABLE 2022-11-10 16:22:15 +01:00
Sara Arjona a529aac615 Merge branch 'MDL-74606-400-support-multilang-group-names-in-mod_assign' of https://github.com/krostas1983/moodle into MOODLE_400_STABLE 2022-11-10 16:04:39 +01:00
Jun Pataleta 0905aae5c6 Merge branch 'master_MDL-75126-allow-multiple-bulk-action-40' of https://github.com/catalyst/moodle-MDL-72752 into MOODLE_400_STABLE 2022-11-10 22:12:07 +08:00
Matheus Rodrigues 5a4a2e9baa MDL-75874 aiken_html: correctly display HTML chars for Aiken questions
Updates the Aiken Format class to process answers correctly, enabling
support for special HTML characteres such as <, >, and &.

Co-authored-by: Leticia Luz <leticia.adrielli.luz@gmail.com>
2022-11-10 09:59:34 -03:00
Safat Shahin 047d341465 MDL-75126 core_question: Allow multiple bulk action from qbank plugins
This commit implements the bulk action api to allow multiple bulk
actions from the qbank plugins instead of one. Any qbank plugin
wants to implement bulk action can now define an array of bulk
actions as a plugin feature.
2022-11-10 23:42:55 +11:00
Sara Arjona 759a87273f Merge branch 'MDL-75448-MOODLE_400' of https://github.com/golenkovm/moodle into MOODLE_400_STABLE 2022-11-10 13:19:42 +01:00
Paul Holden 6c983fda3c Merge branch 'MDL-68550-400' of https://github.com/rezaies/moodle into MOODLE_400_STABLE 2022-11-10 11:59:55 +00:00
Sara Arjona a08e8032c5 Merge branch 'MDL-75974-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-10 12:51:40 +01:00
Paul Holden fbd321ea90 Merge branch 'MDL-76011-400' of https://github.com/abgreeve/moodle into MOODLE_400_STABLE 2022-11-10 11:49:54 +00:00
Sara Arjona fe3ea2fe53 Merge branch 'MDL-75876-MOODLE_400_STABLE' of https://github.com/praxisdigital/moodle into MOODLE_400_STABLE 2022-11-10 12:47:17 +01:00
Sara Arjona 9d1b79c074 Merge branch 'MDL-76167-400' of https://github.com/davewoloszyn/moodle into MOODLE_400_STABLE 2022-11-10 12:42:19 +01:00
Paul Holden a7eab36f96 Merge branch 'MDL-76224-400' of https://github.com/justusdieckmann/moodle into MOODLE_400_STABLE 2022-11-10 08:54:09 +00:00
Paul Holden 3fd54014ae MDL-75862 backup: omit sesskey for continue buttons using get method.
It's automatically added by the rendered single_button instance when
using post method, so no need to add it unconditionally.
2022-11-10 10:17:19 +08:00
Andrew Nicols 87002d24be Merge branch 'MDL-75917-400' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_400_STABLE 2022-11-10 08:48:27 +08:00
Shamim Rezaie c3aba13f79 MDL-68550 tablelib: Use aria-role=button
Use the aria-role=button for:
- show/hide links
- sort links
- reset table preferences link
2022-11-10 06:19:31 +11:00
Shamim Rezaie ba32b852e5 MDL-68550 output: Improve accessibility of the initials bar
- The current item should be focusable otherwise the focus will be lost
  as soon as a user clicks on an item in the initials bar
- Modified behat tests to not mistakenly click on the 'All' link
- The currently selected item is specified by aria-current
- Useed aria-current=true rather than =page because the links of each
  item in the initials bar is missing the pagination information
2022-11-10 06:17:58 +11:00
Shamim Rezaie f4039ba2a9 MDL-68550 output: Improve accessibility of the paging bar
The use of aria-current is based on the example at
https://design-system.w3.org/components/pagination.html
2022-11-10 06:17:58 +11:00
Shamim Rezaie c11f5aa005 MDL-68550 theme: Not showing the gap in the initial bar
The gap issue was a regression from MDL-66670.
2022-11-10 06:17:57 +11:00
Paul Holden c3367700c2 MDL-75872 mod_lesson: allow unlimited attempts default value.
Related change in 252e85be added a similar value per activity, we
should also allow it to be chosen as a default for the site.
2022-11-09 18:54:08 +00:00
Sara Arjona b680dd8894 Merge branch 'MDL-50935-400-2' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-11-09 16:01:24 +01:00
Meirza 3259a19a6a MDL-76131 core_user: encode social profile fields data. 2022-11-09 15:49:39 +01:00
Justus Dieckmann 11f8109d4c MDL-76253 calendar: Use activities monologo pix 2022-11-09 15:22:08 +01:00
Jun Pataleta 2172f91656 Merge branch 'MDL-76185-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-11-09 21:51:25 +08:00
Jun Pataleta ed7137f7f1 Merge branch 'MDL-76054_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-11-09 20:09:04 +08:00
Sara Arjona de3a8678cd Merge branch 'MDL-75889-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-09 12:36:48 +01:00
Sara Arjona a0af8ccba9 Merge branch 'MDL-76059-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-09 12:31:38 +01:00
David Woloszyn 7eadd4979c MDL-76091 lib: Add additional check to local URLs params 2022-11-09 19:24:27 +08:00
Sara Arjona 63f9d1edc4 Merge branch 'MDL-75766-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-11-09 11:57:32 +01:00
Sara Arjona 5231856a76 Merge branch 'MDL-74201-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-11-09 11:49:40 +01:00
Víctor Déniz cf86a03796 Merge branch 'MDL-76000-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-09 10:11:38 +00:00
Jun Pataleta 14c5642fa7 Merge branch 'MDL-76170-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-11-09 15:44:27 +08:00
Jake Dallimore 921e34a607 MDL-76099 core_backup: set selected overflow node in restore and copy
These pages sit under the 'restore' and 'copy' menu items respectively
but the selected menu item isn't correct because the 'restore.php' and
'copyprogress.php' page URLs don't match the node action for their
respective 'restore' and 'copy' nodes. Force set the selected node in
each case to resolve this.
2022-11-09 15:22:51 +08:00
Stevani Andolo 7d9ab768a4 MDL-76099 core_navigation: allow setting selected course overflow node
Allow pages to choose which course reuse overflow node is selected, to
handle cases where the default selection (based on matching PAGE->url
to the node action URL) isn't possible (such as when several pages need
to exist under the same selected node).
2022-11-09 15:22:51 +08:00
Jake Dallimore 4938cb25b1 MDL-76170 enrol_lti: fix missing secret in enrol_lti_users
If member sync runs before the user launches the tool, a partial record
is created, without consumer secret. Subsequent launches of the tool by
that member don't resolve this and this results in grade sync failing
for any affected users. This patch:
- data fixes the existing affected rows
- fixes the launch code, ensuring secret is recorded on launch,
irrespective of whether the user info record has been created already
or not.
2022-11-09 10:03:50 +08:00
Frédéric Massart bb66f7e425 MDL-74201 backup: Restore reference to content bank files 2022-11-08 20:18:30 +01:00
Eloy Lafuente (stronk7) f1a8f0059c MDL-76054 environment: Remove the php-xmlrpc extension check
For Moodle 4.1 and up, the php-xmlrpc is not needed anymore:
- All the MNet stuff has been moved to use php library (MDL-76055).
- The webservice/xmlrpc has been moved from core to contrib (MDL-76052).

So we just remove the check here. Starting with 4.1, it's not
needed for any core functionality.

No lang string changes in this branch, only in master (4.1dev).
2022-11-08 16:45:44 +01:00
Víctor Déniz 543b0e0055 weekly release 4.0.4+ 2022-11-08 13:44:44 +00:00
Jake Dallimore df8a9bdde7 MDL-63037 mnet: fix hostexists string usage 2022-11-08 17:05:06 +08:00
Jake Dallimore 98d5109d91 Merge branch 'MDL-75941-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-08 12:04:29 +08:00
Jun Pataleta 9508492e28 Merge branch 'MDL-76113-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-11-08 12:01:54 +08:00
Jake Dallimore 590bfd9029 Merge branch 'MDL-76071-400' of https://github.com/laurentdavid/moodle into MOODLE_400_STABLE 2022-11-08 11:44:17 +08:00
Jake Dallimore 475784b2b5 Merge branch 'MDL-72882-400-3' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-11-08 11:32:06 +08:00
Jun Pataleta d77935d8ea Merge branch 'MDL-76207-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-11-08 10:25:35 +08:00
Paul Holden 31889f9b20 MDL-75974 tool_customlang: check out language pack in CLI import. 2022-11-07 22:41:01 +00:00
Paul Holden 7526bfd8b7 MDL-75889 core: compare domain names in a case-insensitive manner.
As per https://www.rfc-editor.org/rfc/rfc1035#section-3.1
2022-11-07 22:37:07 +00:00
Justus Dieckmann f4b822a178 MDL-76224 Resource: Set correct page url in /mod/label/view.php 2022-11-07 18:46:20 +01:00
Andrew Nicols 3886236dae Merge branch 'MDL-75880_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-11-07 21:57:05 +08:00
Andrew Nicols b2b7a091b7 Merge branch 'MDL-73624-400' of https://github.com/meirzamoodle/moodle into MOODLE_400_STABLE 2022-11-07 21:52:11 +08:00
Andrew Nicols 8858280766 Merge branch 'MDL-75519-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-11-07 21:41:49 +08:00
Víctor Déniz c95c319fad Merge branch 'm40_MDL-74912_Fix_RegExp_Word_Boundaries_On_MySQL8' of https://github.com/scara/moodle into MOODLE_400_STABLE 2022-11-07 10:20:03 +00:00
Jun Pataleta 1a35908e1f MDL-50935 atto_equation: Add upgrade step to fix existing sites 2022-11-07 15:14:17 +08:00
Jun Pataleta d474d4f3cf MDL-50935 atto_equation: Fix display of matrix template
Thanks to Geoffrey Rowland's fix suggestion.
2022-11-07 15:13:06 +08:00
Andrew Nicols cbc0b075b7 MDL-74468 mod_bigbluebuttonbn: Coding style violation fix 2022-11-07 12:14:21 +08:00
Andrew Nicols 3698429d29 Merge branch 'MDL-74468-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-11-07 12:14:17 +08:00
Andrew Nicols 7b18e8ad63 MDL-76207 contentbank: Switch to opened window 2022-11-07 10:03:08 +08:00
Matteo Scaramuccia a052c15e6a MDL-74912 dml: Fix PHP coding style problems 2022-11-05 10:08:13 +01:00
Matteo Scaramuccia 1a84f17a20 MDL-74912 dml: Fix missing nullable marker 2022-11-05 10:08:13 +01:00
Matteo Scaramuccia 8c0d6a1869 MDL-74912 mod_forum: Fix regexp word boundaries markers in MySQL 8 2022-11-05 10:08:13 +01:00
anisa kusumadewi ab42a71563 MDL-75766 core_h5p: Added index for pathnamehash to h5p table 2022-11-04 16:54:38 +01:00
Eloy Lafuente (stronk7) 88f2c9bb45 MDL-75880 phpunit: fix all @coversDefaultClass missing @covers
Because @coversDefaultClass doesn't indicate any coverage (it's
just an alias to avoid having to write the class name in @covers),
this commit fixes all the files that were using that annotation
and missing any @covers.

Basically, replacing one by the other and done.
2022-11-04 16:51:24 +01:00
Víctor Déniz d7e367af90 Merge branch 'MDL-76130-400' of https://github.com/meirzamoodle/moodle into MOODLE_400_STABLE 2022-11-04 15:36:56 +00:00
Sara Arjona 28043b9b2e weekly release 4.0.4+ 2022-11-04 14:51:59 +01:00
Sara Arjona 3f30ad9df0 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-11-04 14:51:56 +01:00
hieuvu 001fdb5f29 MDL-75917 moodle_page: add a modname to body tag.
This is a backport of MDL-75844
2022-11-04 16:04:02 +07:00
Laurent David 79153d99cd MDL-74468 mod_bigbluebuttonbn: Fix logger count method
* The logger::count_callback_events was confusing and needs clarification
and small refactoring.
2022-11-04 09:38:11 +01:00
Laurent David f75aed1c54 MDL-74468 mod_bigbluebuttonbn: Remove getallheader
* getallheader is only fully compatible with Apache servers. Replace it
with a polyfill.
2022-11-04 09:38:11 +01:00
Shamiso.Jaravaza 4436dd0fea MDL-74468 mod_bigbluebuttonbn: Fix custom completion for BBB
* BBB has specific completion indicator that need to be taken into account
* Fix mock requests so we can send participant id and then attach events to them
* Refactor slightly the broker to split meeting logic from request (decoding)
* Fix update completion state cron
2022-11-04 09:38:11 +01:00
Meirza 296fa4b83d MDL-76130 install: make the button to the center position 2022-11-04 11:23:21 +07:00
Jun Pataleta bbc586af7e Merge branch 'MDL-76103-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-11-04 11:34:36 +08:00
Marina Glancy 1ec11f0761 MDL-76103 search: skip solr behat tests if solr is not installed 2022-11-04 11:22:13 +08:00
Jun Pataleta 61e0c07247 Merge branch 'MDL-76072-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
Víctor Déniz 8902acf217 Merge branch 'MDL-70071-400' of https://github.com/Chocolate-lightning/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
Sara Arjona 38f0e86110 Merge branch 'MDL-76169-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
Sara Arjona df8978e969 Merge branch 'MDL-75759-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
Andrew Nicols ab6a1b655b Merge branch 'MDL-75904-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
Andrew Nicols d0c489dab7 Merge branch 'MDL-75784-400' of https://github.com/JBThong/moodle into MOODLE_400_STABLE 2022-11-04 11:13:14 +08:00
AMOS bot 437ce92e1b Automatically generated installer lang files 2022-11-04 00:07:35 +00:00
David Woloszyn 82d7777ca5 MDL-76167 installer: Corrected dockblock param types 2022-11-04 10:46:20 +11:00
Mihail Geshoski c37c8fd6fa MDL-76185 mod_glossary: Remove separator in continuous display format 2022-11-03 23:54:09 +08:00
Andrew Nicols 1d8d73c761 MDL-70071 forum: Convert post threshold warnings to info 2022-11-03 15:03:44 +08:00
Jun Pataleta 8ef225eb62 MDL-72882 tool_langimport: Set default language when deleting lang pack
* When the language pack being deleted is
  - the same as the site default language, we must set the site default
    language to 'en'.
  - fix the user's current language to the default site language.
2022-11-03 14:00:11 +08:00
Jun Pataleta 9cca971abc MDL-72882 core: Use default site lang when user lang no longer available
* Check that the lang attribute for the output HTML exists. If not,
use the default site language.
* Also fix the current language for the user.
2022-11-03 14:00:09 +08:00
Andrew Nicols 6509945bcd MDL-76169 question: General behat fixes
Whilst amending these tests I discovered some other minor fixes to be
made.
2022-11-03 13:28:52 +08:00
Andrew Nicols b4a53cba59 MDL-76169 question: Use action menu steps consistently 2022-11-03 13:28:52 +08:00
Andrew Nicols 5e0b235790 MDL-76169 mod_quiz: Add quiz question bank behat resolver 2022-11-03 13:28:52 +08:00
Andrew Nicols e53e25af94 MDL-76169 behat: Normalise exception message in should (not) steps
These steps have accepted a NodeElement instance as an argument for some
time, but were trying to cast it to string when formulating exception
messages, making it harder to debug and, in the case of the 'should see'
step, not work at all.

This patch introduces a new function to produce a consistent naming for
them.
2022-11-03 13:28:52 +08:00
Andrew Nicols 414a99535b MDL-76169 behat: Add improved steps for using action menus
This commit adds new steps related to action menus to support:
* Choosing an item in a named action menu
* Choosing an item in a named action menu within a container
* Confirming that an action menu item does or does not exist in a named
  action menu
* Confirming that an action menu item does or does not exist in a named
  action menu within a container

The existing action menu steps were insufficient as they assume that
there is only one action menu within he container, which is not
necessarily the case.

The existing action menu steps are not non-JS friendly and will error if
JS is disabled, without providing any fallback when one is easily
available.

Unfortunately these steps cannot be used to replace the existing steps
without manual intervention.
2022-11-03 13:28:51 +08:00
Jun Pataleta 1ae08553b7 MDL-75759 courseformat: Link classes in PHPDocs with @see tags
- Linking classes/methods mentioned in PHPDoc with @see tags help devs
checking the PHPDoc to quickly navigate to the class/method mentioned
and also helps us ensure that it points to the correct class/method.
- Some typo/grammar fixes as well in existing PHPDoc descriptions.
- Fixed parameter type in execute()'s PHPDoc block.
2022-11-03 11:58:18 +08:00
Simey Lameze 97c3804ac3 MDL-75759 courseformat: fix documentation of stateupdates tests 2022-11-03 11:58:18 +08:00
Jun Pataleta 55f0f4e0f4 MDL-75759 courseformat: Fix stateactions test
* Require lib/externallib.php in
\core_courseformat\output\local\state\cm::export_for_template()
* Point @coversDefaultClass to the proper class.
2022-11-03 11:58:18 +08:00
Simey Lameze cd642570f1 MDL-76072 tool_lp: only init inlineGrader module if user can grade 2022-11-03 11:42:02 +08:00
Jake Dallimore d7b4dd9a6a MDL-76113 enrol_lti: Fix secret on lti user for LTI 2.0 consumers
Fixes the enrol_lti_users.consumersecret field for LTI 2.0 users.
This field erroneously contained the tool secret and not the consumer
secret needed for service requests when used with LTI 2.0 consumers,
which resulted in complete grade sync failure for LTI 2.0 consumers.
This patch:
- adds an upgrade step to address existing incorrect secrets for LTI
2.0 launched users. It sets these to the correct consumer secret.
- fixes the way the secret is first set during a launch, ensuring
this->consumer->secret is used, which properly captures either the
tool secret (for 1.1 launches) or the consumer secret (for 2.0
launches).
2022-11-02 17:00:49 +08:00
Sara Arjona dc02b1bbb2 Merge branch 'MDL-61880-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-11-02 08:30:14 +01:00
Jun Pataleta 18ce123c4e Merge branch 'MDL-75038-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-02 13:39:21 +08:00
Jun Pataleta 1a61b0bb6c Merge branch 'MDL-75848-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-11-02 13:20:06 +08:00
Jake Dallimore 93318586a5 MDL-61880 tool_oauth2: don't rely on discovery when editing issuers
Adjusts the testing scenarios so that we don't rely on endpoint
discovery being run during an issuer edit, which is no longer the case.
For scenarios that need a userinfo endpoint, set this manually.
2022-11-02 11:12:03 +08:00
Jake Dallimore 177caaa3b5 MDL-61880 core: don't clear issuer fields not present in form data
In cases where we have an id, load the persistent and then set new data
before saving. This ensures we don't delete fields which are missing in
the form data.
2022-11-02 11:12:03 +08:00
Yannick Forget 33b1897e55 MDL-61880 core: Retain OAuth 2.0 user field mappings after issuer update 2022-11-02 11:11:51 +08:00
Paul Holden abebddafc2 MDL-75038 blog: link back to user only when one specified. 2022-11-01 21:26:54 +00:00
Ilya Tregubov dca920d105 weekly release 4.0.4+ 2022-11-01 15:00:01 +03:00
Andrew Nicols 254eb24e80 Merge branch '400-mdl-75010' of https://github.com/danmarsden/moodle into MOODLE_400_STABLE 2022-11-01 11:52:45 +08:00
Jun Pataleta 8552936427 Merge branch 'MDL-76120-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-11-01 09:17:03 +08:00
Sara Arjona f683ec0990 Merge branch 'MDL-75771-MOODLE_400_STABLE' of https://github.com/PhMemmel/moodle into MOODLE_400_STABLE 2022-10-31 13:39:49 +01:00
Jun Pataleta c4b81d09dc Merge branch 'MDL-76108-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-10-31 16:49:14 +08:00
Jake Dallimore 8d9ae08d7a Merge branch 'MDL-76041-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-10-31 11:44:09 +08:00
Jun Pataleta 889e427df0 Merge branch 'MDL-75358-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-10-31 10:10:09 +08:00
Dan Marsden 2c99c5fa4d MDL-75010 core: Prevent user last access update on user key login 2022-10-31 14:19:31 +13:00
Víctor Déniz c26e24b613 Merge branch 'MDL-68437-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-10-28 18:26:48 +01:00
Amaia Anabitarte 97c52ca3a1 MDL-76108 mod_lesson: improving count call for PHP8.0 2022-10-28 18:17:52 +02:00
Philipp Memmel 42b3b6da8d MDL-75771 core_courseformat: Add behat test for show_editor function 2022-10-28 17:25:52 +02:00
Philipp Memmel 8db30d32f8 MDL-75771 core_courseformat: Fix capability for edit controls
course_format\base:show_editor now by default uses 'moodle/course:manageactivities', but also accepts other capabilities as param
2022-10-28 17:25:29 +02:00
Andrew Nicols b35468292e MDL-76120 behat: Swap click on select option to set field
Recent versions of Marionette do not like to click on the option
element so we must always use the set field option.

Change-Id: I9e1397700db53328d15e049e2f4c565888975079
2022-10-28 21:14:07 +08:00
Sara Arjona 141e369a01 weekly release 4.0.4+ 2022-10-28 14:09:16 +02:00
Meirza 0b8ab0da36 MDL-76070 dataformat_json: Fix data loss in the exported file. 2022-10-28 13:16:04 +07:00
Jake Dallimore 27bbd43730 MDL-68943 assignfeedback_editpdf: fix version numbers 2022-10-28 12:05:21 +08:00
Jake Dallimore 666e68d5dc Merge branch 'MDL-68943-400' of https://github.com/cameron1729/moodle into MOODLE_400_STABLE 2022-10-28 11:49:59 +08:00
Cameron Ball 064b544465 MDL-68943 assignfeedback_editpdf: Upgrade step for stale conversions 2022-10-28 11:25:45 +08:00
Cameron Ball 32094232c7 MDL-68943 assignfeedback_editpdf: Reconvert updated files 2022-10-28 11:25:45 +08:00
Jake Dallimore 27acd15fb4 Merge branch 'MDL-76069-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-10-28 09:36:08 +08:00
Sara Arjona a8e813a289 Merge branch 'MDL-76023-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-27 17:03:57 +02:00
Víctor Déniz 789e0a41dc Merge branch 'MDL-75969-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-27 15:44:59 +01:00
Mihail Geshoski 145a0690da MDL-76069 enrol_manual: Fix missing breadcrumbs 2022-10-27 21:57:04 +08:00
Meirza 10ac386fd2 MDL-73624 lib_spout: encode output file name 2022-10-27 16:50:17 +07:00
Adrian Greeve 91bf85846e MDL-76011 lib: Updated the zip writer to retain the modified date. 2022-10-27 15:06:31 +08:00
Meirza aceac725e6 MDL-75890 block_myoverview: Added new wrapper element
Added a new element to wrap filter control in Course Overview,
so it will display well on desktop and mobile.

Co-authored-by: Huong Nguyen (huongnv13@gmail.com)
2022-10-26 16:21:22 +07:00
Thong Bui 744cd41a4d MDL-75784 Forms: Fix issues multi expand all/collapse buttons on a page 2022-10-26 14:05:50 +07:00
Marina Glancy 281fe1161a MDL-75519 reportbuilder: set default sortorder for Users datasource 2022-10-25 11:19:21 +02:00
Jun Pataleta dbb2deed8c weekly release 4.0.4+ 2022-10-25 17:17:09 +08:00
Jun Pataleta 59bcc16e26 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-10-25 17:17:06 +08:00
Laurent David 9b1a88cbd9 MDL-76071 mod_choice: fix choice display on graphs
* The setting "Display mode" modifies the choices alignment of radio choice button
from horizontally to vertically. It should also display the list of choices in
the graph in the same directions.
2022-10-25 10:42:49 +02:00
Stevani Andolo 1fe377b410 MDL-71951 calendar: Accessbility issue fix 2022-10-25 13:07:16 +08:00
Jake Dallimore 8888b7756f Merge branch 'MDL-75727_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-10-25 11:56:24 +08:00
Andrew Nicols 8f2dc4b229 Merge branch 'MDL-76049_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-10-25 11:49:46 +08:00
Andrew Nicols f993f02826 Merge branch 'MDL-75763-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-10-25 11:11:40 +08:00
Jake Dallimore 84b7fd82b6 Merge branch 'MDL-74315-400' of https://github.com/roland04/moodle into MOODLE_400_STABLE 2022-10-25 11:09:17 +08:00
Víctor Déniz a6448908ed Merge branch 'MDL-75074-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-10-24 16:43:19 +01:00
Andrew Nicols 86a3a3d9c0 Merge branch 'MDL-74911-400' of https://github.com/matthewhilton/moodle into MOODLE_400_STABLE 2022-10-24 22:23:03 +08:00
Sara Arjona 2184c2368f Merge branch 'MDL-73030-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-24 15:47:27 +02:00
Sara Arjona 023b30e1bb Merge branch 'MDL-75897-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-24 15:35:36 +02:00
Jun Pataleta b2e715f33d Merge branch 'MDL-75936-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-24 15:58:05 +08:00
Andrew Nicols 34845eaad2 MDL-75936 core_message: Drawer must be ready before firing drawer events
This commit addresses a race condition when showing the message drawer
and opening the settings page from the Message preferences page.

In that situation, the message/edit.php page calls the
message_drawer_helper.showSettings function, which publishes a request
to show the drawer.

In some conditions (notably faster machines, or after MDL-66107) this
event is fired before the message_drawer.init has listened to it.

The solution here is to delay firing of the event until the drawer
announces itself as ready.

This ensures that the event is subscribed to before it is fired.

Change-Id: Id90df6b90f8803e25df0be6260a435c09031cf45
2022-10-24 14:30:32 +08:00
Jun Pataleta 6c8db244c7 Merge branch 'MDL-76018-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-10-24 13:16:06 +08:00
Matthew Hilton 1169179385 MDL-74911 assignfeedback_editpdf: unlock session when polling conversion
Polling conversions will run the document conversion immediately if the
conversion has not already been completed.

Releasing the session lock while doing this ensures large conversions
do not unnecessarily hold the users session.
2022-10-24 12:57:33 +10:00
Matthew Hilton c431058d92 MDL-74911 assignfeedback_editpdf: per-assignment conversion poll lock
The lock ensures that multiple conversions do not happen for the same
assignment submission.

Otherwise, subsequent conversions will fail when trying to save the
converted file.
2022-10-24 12:57:31 +10:00
AMOS bot 19c42ef49d Automatically generated installer lang files 2022-10-23 00:08:16 +00:00
Paul Holden ec0c7a2788 MDL-75904 admin: ignore $CFG->allowcategorythemes during installation. 2022-10-21 23:22:28 +01:00
Paul Holden ef34b06efa MDL-76059 forms: graceful early exit for invalid button elements.
Ensure login form tries to capture guest button only if it exists.
2022-10-21 19:36:36 +01:00
Paul Holden 96f8c0a106 MDL-75848 editor_atto: fix console error when clicking toolbar menu. 2022-10-21 19:19:16 +01:00
Sara Arjona bf0bf4be24 Merge branch 'MDL-72828-400' of https://github.com/davewoloszyn/moodle into MOODLE_400_STABLE 2022-10-21 16:24:47 +02:00
Ilya Tregubov 9d7609f39c weekly release 4.0.4+ 2022-10-21 15:33:49 +03:00
David Woloszyn 90553e9f6e MDL-72828 js: get_strings supports jquery objects 2022-10-21 15:02:33 +11:00
Tim Hunt 06f1241f24 MDL-76049 quiz generator: update calendar events for new overrides 2022-10-20 23:45:32 +01:00
Sara Arjona 92ef33c4e0 Merge branch 'MDL-75791-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-10-20 16:36:54 +02:00
Ilya Tregubov 20288fee39 Merge branch 'MDL-72058-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-20 15:42:48 +03:00
Paul Holden 50568e9382 MDL-75897 output: safer checking of course reuse action nodes.
Also ensure that if course reuse contains only a single node (e.g.
reset), then it is still accessible from secondary navigation.

Co-authored-by: Meirza Arson <meirza.arson@moodle.com>
2022-10-20 11:08:32 +01:00
Víctor Déniz a8444275b1 Merge branch 'MDL-75907-400' of https://github.com/golenkovm/moodle into MOODLE_400_STABLE 2022-10-20 10:46:35 +01:00
Jun Pataleta 2875fb574a Merge branch 'MDL-75497-400' of https://github.com/raortegar/moodle into MOODLE_400_STABLE 2022-10-20 17:29:04 +08:00
Jun Pataleta e519e93871 Merge branch 'MDL-75599-400' of https://github.com/laurentdavid/moodle into MOODLE_400_STABLE 2022-10-20 17:26:02 +08:00
raortegar f39af49969 MDL-75497 mod_data: Review Check existence of field.class.php 2022-10-20 10:01:14 +02:00
Andrew Nicols 44518ff64d Merge branch 'MDL-75834-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-10-20 14:37:49 +08:00
Jun Pataleta 952079533c Merge branch 'MDL-59458-400' of https://github.com/laurentdavid/moodle into MOODLE_400_STABLE 2022-10-20 13:08:50 +08:00
Laurent David 7af2bad4e2 MDL-75599 mod_data: Fix warning message
* Fix warning message when accessing advanced search page with a date field.
2022-10-20 06:53:07 +02:00
Víctor Déniz 9416a1a399 Merge branch 'MDL-75962-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-20 00:44:49 +01:00
Paul Holden f006c73a17 MDL-75941 theme_boost: don't auto grow breadcrumb items.
On mobile/small breakpoint, display breadcrumb items without
excess whitespace.
2022-10-19 21:57:00 +01:00
Paul Holden 7d883400d9 MDL-76000 theme_boost: reset form padding when in tertiary navigation. 2022-10-19 21:06:14 +01:00
Laurent David c0d17ca8ba MDL-76041 mod_bigbluebuttonbn: Exception on Recording only page
* This fixes a the parameter provided to the get_recordings method of recording class
2022-10-19 21:18:53 +02:00
Paul Holden 4d9b3c9839 MDL-76023 course: fix access to custom data in notification task.
The message class `customdata` property is automatically JSON encoded
via magic setter method, so we can't append to it directly.
2022-10-19 18:52:35 +01:00
Jun Pataleta 984057c7cd Merge branch 'MDL-75985-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-19 21:27:48 +08:00
Andrew Nicols 825f039968 MDL-75985 behat: Return newline character for \n
Somehow part of this commit was lost during the push and/or squash.
2022-10-19 20:27:13 +08:00
Sara Arjona d1a16f5f4a Merge branch 'MDL-76020-400' of https://github.com/mickhawkins/moodle into MOODLE_400_STABLE 2022-10-19 13:01:04 +02:00
Sara Arjona f00b1a838e Merge branch 'MDL-76010_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-10-19 12:56:25 +02:00
Michael Hawkins baba4d8cc2 MDL-76020 theme: Add missing support links to footer in Classic theme
The "Services and support" and "Contact site support" links were
missing from the footer in the Classic theme (which now has its own
footer template), so there was no way to navigate to the relevant links.
2022-10-19 17:52:54 +08:00
Jun Pataleta eb4b144e13 Merge branch 'MDL-75645_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-10-19 15:37:26 +08:00
Ilya Tregubov d20501ecf2 Merge branch 'MDL-74654-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-10-19 09:23:34 +03:00
Jun Pataleta 36afea55eb Merge branch 'MDL-75985-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-19 10:55:52 +08:00
Shamiso.Jaravaza afd07d1e42 MDL-74654 mod_bigbluebuttonbn: Add role parameter 2022-10-18 08:23:54 -06:00
Mikel Martín 320d99378c MDL-74315 reportbuilder: Fix report filters hidden under top navbar
- Add scrolling to big filter containers to avoid them to be hidden under header
- Remove custom reportbuilder scrollbar mixin and replace it with 'thin-scrolls'
  standard mixin
2022-10-18 15:34:02 +02:00
Eloy Lafuente (stronk7) 06f4976cab MDL-75645 mnet: Stop caching OpenSSLAsymmetricKey keys
The mnet_environment->keypair array contains the following
elements (and more, just focussing on these):
- keypair_PEM : textual representation of the private key.
- certificate : textual representation of the public key.
- privatekey  : OpenSSLAsymmetricKey representation of the private key,
                generated from keypair_PEM. See get_private_key().
- publickey   : OpenSSLAsymmetricKey representation if the public key,
                generated from certificate. See get_public_key().

The last 2 elements in the array are only used as "caching", to avoid
having to call to openssl_pkey_get_private() and
openssl_pkey_get_public() to convert from the textual representation
to the OpenSSLAsymmetricKey representation that is the one required
by a number of openssl functions.

Problems arrive when, as part of the MNet protocol, the mnet_environment
is serialised, because, since PHP 8.0 those OpenSSLAsymmetricKey objects
aren't serialisable any more.

So, as far as they are only used for internal caching it's perfectly ok
to remove the caching bits and use the openssl_pkey_get_xxx() methods
to calculate them under demand.

The alternative to this would be to implement into the mnet_environment
some custom serialisation, skipping those OpenSSLAsymmetricKey
instances, using __sleep(), the Serializabla interface or __serialize(),
but that seems unnecessary because, as explained above, the uses are
really limited and easily replaceable.

That's what this patch does.
2022-10-18 14:30:56 +02:00
Eloy Lafuente (stronk7) 0bf0f82444 MDL-76010 behat: New scenario to verify that manual attempts work
This is basically the manual background that was removed in the
previous commit, with 4 attempts here. Note it includes the 2
waits that are REQUIRED to make it pass in too-quick environments.

If they are removed, they begin to fail because it seems that
the attempts need a minimum of separation between them.
2022-10-18 14:27:59 +02:00
Eloy Lafuente (stronk7) 7b9adf44bf MDL-76010 behat: Move feature to use attempts generator
This moves away from manual attempts and uses the activity
attempts generator instead. Quicker and not exposed to the
problems with clicks, refreshes and missing attempts.

Note that there is a small change in the attempt generator
so, now, when a new attempt is created, if the activity has
tracking enabled, the final result / grades are recalculated.

That's the real behaviour when the activity settings are
changes in the edition form and it's natural to get them
recalculated without having to visit the form. Specifically,
this allows the 1st scenario to pass, because in that scenario
no changes to the form are being performed.

Also, little detail, amend a dupe scenario name.
2022-10-18 14:27:59 +02:00
Sara Arjona 3d2710653e weekly release 4.0.4+ 2022-10-18 13:09:54 +02:00
Ilya Tregubov 6dba57ee81 Merge branch 'MDL-75173-400-fix' of https://github.com/sarjona/moodle into MOODLE_400_STABLE 2022-10-18 10:18:11 +03:00
Sara Arjona ecc896f4b4 MDL-75173 completion: Remove ordering from PHPUnit
To avoid getting some random errors with Oracle, the order for the
students have been removed from the tests (to check they are there,
regardless the order they are returned, because in that case, the
order is not important).
2022-10-18 08:37:57 +02:00
Jun Pataleta 616e01911e Merge branch 'MDL-75783-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-18 10:06:40 +08:00
Andrew Nicols 524d855f6b MDL-75783 javascript: Add optional jsconfig configuration
This commit adds a new Grunt task which generates a jsconfig.json file.

This file is described at
https://code.visualstudio.com/docs/languages/jsconfig and can be used
to configure vscode and other similar editors to understand our module
loading.

This task is an optional task for Grunt and can be run with:

    npx grunt jsconfig

The file is git-ignored and will not affect normal usage.
2022-10-18 09:33:04 +08:00
Víctor Déniz 0d855827c7 Merge branch 'MDL-75983_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-10-18 01:07:54 +01:00
sam marshall 1d9d855172 MDL-76018 core_navigation: Activity header warning if no module intro 2022-10-17 17:28:36 +01:00
Sara Arjona 1cb527de1c Merge branch 'MDL-75711-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-10-17 16:55:59 +02:00
Sara Arjona df5626b1a3 Merge branch 'MDL-72836-400' of https://github.com/mickhawkins/moodle into MOODLE_400_STABLE 2022-10-17 16:39:53 +02:00
Sara Arjona 27c2863777 Merge branch 'MDL-75077-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-17 16:32:40 +02:00
Sara Arjona b169ba0121 Merge branch 'MDL-74814-400-1' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-10-17 15:30:53 +02:00
Sara Arjona c317ee7de0 Merge branch 'MDL-75173-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-10-17 15:18:03 +02:00
Jun Pataleta 3f7c4d65e9 Merge branch 'MDL-74958-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-10-17 21:10:45 +08:00
sam marshall e49bd4e798 MDL-74958 core_navigation: Add renamed classes to renamedclasses.php
The renamed secondary navigation classes have been adeed to
renamedclasses.php files.
2022-10-17 10:56:15 +01:00
sam marshall e555d057e9 MDL-74958 core_navigation: Secondary nav in plugins, change namespace
This is a backport of MDL-74733.

Secondary nav previously had to be in my_plugin\local\views\secondary;
this location continues to work but will be deprecated in 4.1. The new
location is my_plugin\navigation\views\secondary.
2022-10-17 10:55:41 +01:00
Huong Nguyen c5c13aa9ae MDL-74814 forms: Fix accessibility issue in edit profile page
- Fixed legend tag issue
 - Modified the passwordunmask Javascript hide/unhide the password field by CSS class
2022-10-17 15:51:54 +07:00
Andrew Nicols b01fee2008 MDL-75969 behat: Allow the editor field to request a save
Some editors do not immediately store their content to the textarea they
represent and only do so when the form is submitted or they are
requested to.

This change adds to the existing API to allow an (optional)
`store_current_value` function to be defined for the editor type so that
it can use the JavaScript API to persist any current content to the
editor.
2022-10-14 23:46:25 +08:00
Andrew Nicols 3418b4d61c MDL-75985 behat: Standardise HTML output when comparing editor content
This commit adds a standardise_html function and updates the matches
function to compare normalised content.

This allows for a wider variety of valid editor output to be handled
using the standard value matching steps in Behat, thus supporting
editors other than Atto better.
2022-10-14 23:44:11 +08:00
Víctor Déniz dfd9b50595 Merge branch 'MDL-75736-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-10-14 16:10:43 +01:00
Eloy Lafuente (stronk7) 5b60a837d1 MDL-75983 gha: Update used actions to be node16 compatible
Node12 is being deprecated in github for actions:

https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/

So we need to ensure we are using node16 actions.
2022-10-14 13:27:26 +02:00
Sara Arjona 00ad2a14da weekly release 4.0.4+ 2022-10-14 12:49:18 +02:00
Sara Arjona 764d2cd510 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-10-14 12:49:15 +02:00
Ilya Tregubov ddb0f7dc92 MDL-75173 core_completion: More unit tests and Behat. 2022-10-14 11:47:50 +03:00
Ilya Tregubov 59303de673 MDL-75173 core_completion: Fixes after review.
Unit tests added. Used new steps in Behat. Code style fix for long line.
2022-10-14 11:47:50 +03:00
Ilya Tregubov 1a7d05eca7 MDL-75173 core_completion: Fix completion for different settings. 2022-10-14 11:47:50 +03:00
Ilya Tregubov 289d5f3faa MDL-75173 core_completion: Inconsistent status check.
There is inconsistent status check for course completion block and
completion details page. Completion block was taking to account
pending statuses for completion criteria while completion details
page was ignoring those.
2022-10-14 11:47:50 +03:00
Ilya Tregubov aa34b109a4 MDL-75173 behat: Fix broken test.
Test was testing failing state when student didn't receive passing
grade. But it was expecting that completion criteria is completed
which was wrong.
2022-10-14 11:47:50 +03:00
Ilya Tregubov c4cd3a61c8 MDL-75173 core_completion: Fix course completion criteria marking.
SQL was fetching activities where completion state was 'completed,
but not passed reqyured grade'. For course completion such states
must be ignored.

Also fixed progress bar on my courses page. Same reasoning as above.
2022-10-14 11:47:49 +03:00
AMOS bot f4e4bfd3da Automatically generated installer lang files 2022-10-14 00:07:36 +00:00
Víctor Déniz 3cd5cbd327 Merge branch 'MDL-74789-400' of https://github.com/lucaboesch/moodle into MOODLE_400_STABLE 2022-10-13 21:32:19 +01:00
Jun Pataleta 6d805b7774 Merge branch 'MDL-74887-MOODLE_400_STABLE' of https://github.com/sh-csg/moodle into MOODLE_400_STABLE 2022-10-14 00:29:24 +08:00
Paul Holden 38c8f8be7d MDL-75811 reportbuilder: concatenate using list seperator lang config. 2022-10-13 16:26:18 +02:00
Sara Arjona 180048ad9e Merge branch 'MDL-75959-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-13 16:03:37 +02:00
Simey Lameze df1f4b8178 MDL-75984 admin_presets: split test into smaller ones 2022-10-13 15:55:26 +02:00
Ilya Tregubov d5e6b7e7eb Merge branch 'MDL-75970-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-13 14:08:56 +03:00
Stefan Hanauska c9bd3a20b6 MDL-74887 mod_label: Update visibility 2022-10-13 12:42:26 +02:00
Shamim Rezaie a85d347227 Merge branch 'MDL-75642-400' of https://github.com/BruceGoodGuy/moodle into MOODLE_400_STABLE 2022-10-13 16:28:52 +11:00
Tim Hunt b4ed5e95b5 MDL-75727 question regrading: fix each attempt builds on last
This fixes a regression caused by MDL-74752. If you regraded
a subsequent quiz attempt in a quiz using the 'Each attempt
builds on last' option, then the student's response could get lost.
2022-10-12 11:11:18 +01:00
Paul Holden 2700c84d7e MDL-75970 tool_customlang: clarify CLI export target/filename. 2022-10-12 10:16:31 +01:00
Andrew Nicols 24953e5d46 MDL-75962 js: Fix jsdoc violations 2022-10-12 10:07:45 +08:00
Jun Pataleta a2487cbe55 Merge branch 'MDL-75431_400' of https://github.com/AnupamaSarjoshi/moodle into MOODLE_400_STABLE 2022-10-12 09:39:14 +08:00
Jun Pataleta d88a746ec5 Merge branch 'MDL-75887-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-12 09:23:01 +08:00
Simey Lameze 8e5396a6b1 MDL-75887 behat: Add ability to set value regardless of the editor
Prior to this commit, the behat_form_editor integration was hard-coded
to use Atto.

This change allows other editors to be used to set editor values, and
breaks that hard bond. Following this change, any editor is able to
define a behat_editor_[name].php file defining a function which meets
the following signature:

  set_editor_value(string $editorid, string $value): void

Each editor is responsible for checking whether its own API is available
and calling any relevant functions to force the editor to set the
content.

Please note: Behat is unable to determine the current editor in use on
the page automatically.
2022-10-12 06:44:30 +08:00
Andrew Nicols e2ea6b2a8a MDL-75959 customfield: Correct inappropriate class import
I suspect this was an incorrect tab completion import by an IDE which
was missed.
2022-10-12 06:40:33 +08:00
sam marshall a7d47d7813 MDL-75736 lib: Course cache can be rebuilt unnecessarily
This change puts back the behaviour that get_fast_modinfo will accept
a cached version of modinfo that is newer than expected (according to
the course cacherev).

Not accepting newer versions can lead to poor performance in cases
where multiple requests take place at once, or using a clustered
database.
2022-10-11 16:59:59 +01:00
Jun Pataleta 3af0824487 weekly release 4.0.4+ 2022-10-11 23:16:36 +08:00
Jun Pataleta 9872e6f74f Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-10-11 23:16:34 +08:00
AMOS bot 5368babac0 Automatically generated installer lang files 2022-10-11 00:07:33 +00:00
sam marshall d450c5931b MDL-75834 lib: Focus lock JS bug when focus area removed 2022-10-10 16:35:21 +01:00
Sara Arjona 74a5ef1332 Merge branch 'MDL-75656-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-10 16:16:26 +02:00
Anupama Sarjoshi 689a57fa74 MDL-75431 qbank: fix tests with CodeRunner installed 2022-10-10 12:57:52 +01:00
Jun Pataleta 3d32032451 Merge branch 'MDL-75923-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-10 18:24:29 +08:00
Jun Pataleta eee7623eb8 Merge branch 'MDL-75909-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-10 18:08:20 +08:00
Jun Pataleta 30dbafdcdf Merge branch 'MDL-75922-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-10 14:55:26 +08:00
Jun Pataleta 169cb76c9e Merge branch 'MDL-75910-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-10 11:07:15 +08:00
Simey Lameze 7edd9db682 MDL-75923 tool_usertours: Update tour content to match formatted content
When an HTML content area contains invalid HTML, some editors will clean
and validate the content upon submission.

In this case the content was:

    <b>Test content</b>

But this should be wrapped in some form of container which accepts
phrasing content (such as a <p> tag).

Some editors, such as TinyMCE, will normalise the content and add the
wrapping paragraph tags to it.

Furthermore, the bold tag is purely stylistic and does not have semantic
meaning. As a result, the <strong> tag is favoured and some editors,
again such as TinyMCE, will replace bold tags with strong tags.

We should update the content here to be valid HTML (wrap the bold tag
in a para), and use a strong tag rather than bold. This allows this test
to pass both with Atto, and other stricter editors such as TinyMCE 6.
2022-10-10 09:13:41 +08:00
Simey Lameze 583b3e5b3f MDL-75922 behat: Apply @editor_atto tag to tests requiring Atto
These steps are currently using Atto-specific UI features and must
therefore make use of the @editor_atto tag to ensure that they continue
to run using Atto.

A new issue will be raised to migrate each of these to be
editor-agnostic.
2022-10-09 20:26:58 +08:00
Andrew Nicols 45ea8119c6 Merge branch 'MDL-61395-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-09 13:13:16 +08:00
Stefan Hanauska 56cc6bf703 MDL-74887 course: Hide stealth mode without view page 2022-10-08 08:09:38 +02:00
AMOS bot 9cd9153777 Automatically generated installer lang files 2022-10-08 00:07:33 +00:00
Luca Bösch 60c61a832a MDL-74789 course: category full width 2022-10-07 09:25:55 +02:00
Michael Hawkins 8430dc556f MDL-72836 core: Updated security.txt expiry and policy URL 2022-10-07 14:12:05 +08:00
Mikhail Golenkov e9b68a5f13 MDL-75907 core: Add index on temp table to optimise stats cron 2022-10-07 16:18:13 +11:00
Andrew Nicols b4493c2a16 weekly release 4.0.4+ 2022-10-07 13:03:55 +08:00
Andrew Nicols e51085274a Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-10-07 13:03:53 +08:00
Khoa Nguyen Dang 3a886db065 MDL-75642 quiz: Delete multiple (random) questions from quiz 2022-10-07 11:04:02 +07:00
AMOS bot 816e396380 Automatically generated installer lang files 2022-10-07 00:07:39 +00:00
Simey Lameze fc40e74d15 MDL-75910 core_form: Allow editor field to set a hidden label
When an editor is used in a form as part of a group, it is missing its
label element.

This happens because there is no inline template for the editor, and
therefore it reverts to using the old `toHtml` function. The legacy
function does not cater to the editor being in a group, and therefore
does not add the hidden label.

In addition, the hiddenLabel attribute was missing from the editor
element. This is a semi-standard element but must be added to each
supporting element.

Both the missing inline template for the editor, and the hidden label
attribute must be present:
- If the hidden label attribute is not present, then the standard inline
  template will add a visible label within the group.
- If the inline editor template is missing, then the label is not shown
  at all.
2022-10-06 22:54:05 +08:00
Andrew Nicols dc27423087 MDL-75909 mod_data: Make template editor use html editor
When the template editor is configured to use the HTML Editor, it should
indicate this to Behat by setting the `data-fieldtype` to "editor".

This indicates to the behat field manager that the editor is in use,
which ensures that the correct value setting can take place.

This is important in the context of MDL-75887.
2022-10-06 21:48:25 +08:00
Andrew Nicols d62139e86b MDL-71686 core_form: Include missing build 2022-10-06 14:44:17 +08:00
Andrew Nicols fa0dd0abab MDL-71686 core_form: Move form serializer to shared function 2022-10-06 10:21:24 +08:00
Andrew Nicols 5d6424de33 Merge branch 'MDL-71686-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-10-06 10:21:20 +08:00
Shamim Rezaie 3a70d7e816 Merge branch 'MDL-75886-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-10-06 12:24:24 +11:00
Andrew Nicols b3f611a14e MDL-75752 question: Bind contextid param in comment backup
In source_sql, unmapped values must be bound using the
backup_helper::is_sql_param() function.
2022-10-06 09:07:42 +08:00
Andrew Nicols e3b8864cc4 Merge branch 'MDL-75752_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-10-06 09:07:31 +08:00
Víctor Déniz 7c46149ec5 Merge branch 'MDL-74569-400' of https://github.com/lucaboesch/moodle into MOODLE_400_STABLE 2022-10-06 01:44:07 +01:00
Víctor Déniz 3276137f1a Merge branch 'MDL-75192-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-06 01:08:57 +01:00
Víctor Déniz 1eaf570ea7 Merge branch 'MDL-75729-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-10-05 22:07:56 +01:00
Paul Holden 3afbd2a0ad MDL-75077 output: prevent duplicate ID errors in custom menus.
Following on from 8e4a7c6b, we should apply a similar change to
custom menus to account for being collapsed into the "More" menu.
2022-10-05 18:30:08 +01:00
Thorsten Siegmund Bartel 02e99e4a4d MDL-74606 mod_assign: Support multilanguage strings in group names. 2022-10-05 12:54:09 +02:00
Andrew Nicols 80799bfec1 MDL-75886 atto: Always use Atto for @atto tests
This change, which should be easy to mimic for other editors.

This will ensure that the correct editor is used for tests relating to
that editor, or its subplugins.
2022-10-05 09:54:48 +08:00
Jun Pataleta 4d9a42c7d8 Merge branch 'MDL-75351_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-10-04 20:36:10 +08:00
Jun Pataleta 3eba3dc263 Merge branch 'MDL-66955-m400' of https://github.com/NeillM/moodle into MOODLE_400_STABLE 2022-10-04 16:36:34 +08:00
AMOS bot 95c0628b61 Automatically generated installer lang files 2022-10-04 00:07:36 +00:00
Shamiso.Jaravaza 5ee9422b3d MDL-75711 mod_bigbluebuttonbn: Fix recent activity 2022-10-03 11:03:42 -06:00
Frederik Milling Pytlick df530a7012 MDL-75876 core_calendar: Add raise_memory_limit call to export_execute
Added a call to raise_memory_limit in /calendar/export_execute.php as it can be very memory intensive.
2022-10-03 12:47:14 +02:00
sam marshall 0a5b0201b4 MDL-75074 core_courseformat: Output classes are not inherited
If you have one course format that extends another one, any course
format output classes that are not defined in the child format will
now inherit from the parent (instead of from the base class as
before).
2022-10-03 11:22:05 +01:00
Paul Holden 320d38bb49 MDL-73030 backup: case-insensitive detection of Moodle backups. 2022-10-03 09:32:11 +01:00
Paul Holden 21478a1e5e MDL-72058 reportbuilder: replace custom dataformat export format.
The formatting of exported dataformat content is now always dependent
on whether the format supports HTML or not, so we no longer need our
custom export class for providing the same.
2022-10-03 09:15:58 +01:00
Paul Holden e69c09d756 MDL-72058 dataformat: remove HTML when export format lacks support. 2022-10-03 09:15:58 +01:00
Andrew Nicols aba165140b Merge branch 'MDL-75836_400' of https://github.com/jrchamp/moodle into MOODLE_400_STABLE 2022-10-02 21:44:21 +08:00
Tim Hunt 9cd481431b MDL-75351 question comments: don't hard-code system context id 2022-09-30 18:46:43 +02:00
Andrew Nicols 5de4468345 MDL-75614 dml: Unit tests must test something 2022-09-30 16:38:12 +08:00
Andrew Nicols 632bbfafe1 Merge branch 'MDL-75614-debugsqltrace-MOODLE_400_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_400_STABLE 2022-09-30 16:38:08 +08:00
Neill Magill 152d919261 MDL-66955 messages: Improve speed of message search
The OR conditions in the WHERE clause prevented the query from
effectively filtering the messages related to the user quickly, this
change helps gets around this by allowing the database to limit
the rows in the messages table it needs to scan significantly.
2022-09-30 08:30:05 +01:00
Luca Bösch 81f390069d MDL-74569 theme_boost: remove unit from top: 0; 2022-09-30 08:38:47 +02:00
Mihail Geshoski ca77344ead MDL-68437 forum: Support to show only active course users in grader
The following change adds support to show only active course users
in the forum grader and generally replicates the behaviour from the
assignment grader which relies on certain config settings, user
permissions and capabilities.
2022-09-30 12:02:08 +08:00
Mihail Geshoski 7e0b0bc14b MDL-68437 course: ws support to optionally fetch only active users
Modifies the 'core_course_get_enrolled_users_by_cmid' webservice and
the generic js methods that call this webservice and enables defining
whether the ws should only return the active users or all enrolled
users in the course.
2022-09-30 12:02:08 +08:00
Jake Dallimore cdd954430f weekly release 4.0.4+ 2022-09-30 10:17:34 +08:00
Tim Hunt 6ddf63486d MDL-75752 question comments: fix backup query so it uses the index
This should greatly improve the performance.
2022-09-29 11:38:36 +02:00
Andrew Nicols 21e1d60833 Merge branch 'MDL-74922_MOODLE_400_STABLE_fix_storage_wrapper_validate_cache' of https://github.com/gthomas2/moodle into MOODLE_400_STABLE 2022-09-29 12:06:28 +08:00
Andrew Nicols d7f8f844bd Merge branch 'MDL-75721-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-29 11:57:27 +08:00
Jun Pataleta 643d5ec406 Merge branch 'MDL-75782-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-09-29 11:54:04 +08:00
Andrew Nicols 5ce0f28de8 Merge branch 'MDL-75738-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-09-29 11:40:06 +08:00
Jun Pataleta 3304dec7c5 Merge branch 'MDL-75559-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-09-29 10:54:11 +08:00
Jun Pataleta f1e67ccfa3 Merge branch 'MDL-66902_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-28 23:15:42 +08:00
Andrew Nicols 9ff194ffba Merge branch 'MDL-75459-400' of https://github.com/davewoloszyn/moodle into MOODLE_400_STABLE 2022-09-28 22:47:51 +08:00
Paul Holden 6f5fc5f1ee MDL-75192 reportbuilder: observe start day in current week filter.
Ensure we observe the site configuration/preference for calendar
first day of the week, in the current week date filter.
2022-09-28 13:37:01 +01:00
Jun Pataleta df56d5659d Merge branch 'MDL-75827-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-28 20:36:05 +08:00
Jake Dallimore 4938cbd0af Merge branch '40_mdl75668' of https://github.com/danmarsden/moodle into MOODLE_400_STABLE 2022-09-28 16:35:54 +08:00
Andrew Nicols e6983a7a09 Merge branch 'MDL-75447-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-28 12:43:27 +08:00
Jun Pataleta ffac7011b3 Merge branch 'MDL-72490-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-09-28 11:55:16 +08:00
Jun Pataleta d59e83c423 Merge branch 'MDL-75726_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-28 08:12:03 +08:00
Jun Pataleta 2d337c94eb Merge branch 'MDL-75776_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-28 08:06:50 +08:00
Jonathan Champ 1dc488e333 MDL-75836 activities: preserve moodleform validation errors 2022-09-27 14:24:05 -04:00
Andrew Nicols 54f90e39a1 Merge branch 'MDL-75168-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-27 23:42:25 +08:00
Paul Holden e46420e57e MDL-75168 tag: cleanup module tag instances upon course deletion. 2022-09-27 14:10:57 +01:00
Jun Pataleta 409fb784db Merge branch 'MDL-75800-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-27 20:20:00 +08:00
Andrew Nicols 00d62550c6 Merge branch 'MDL-27570_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-09-27 17:02:13 +08:00
Jun Pataleta 3d08e501fe Merge branch 'MDL-71531-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-09-27 16:29:10 +08:00
Andrew Nicols f215a8b9cc Merge branch 'MDL-75460-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-09-27 13:03:43 +08:00
Andrew Nicols acc1354295 MDL-75744 qtype_gapselect: Remove unnecessary javascript tag 2022-09-27 12:45:57 +08:00
Andrew Nicols 9af9a0da85 Merge branch 'MDL-75744-400' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_400_STABLE 2022-09-27 12:37:55 +08:00
Paul Holden 789e3f42c0 MDL-75827 theme_boost: append table elements to popover whitelist.
This allows for their use within popover tooltips, such as those
used for showing help icon dialogues.
2022-09-26 16:00:10 +01:00
Eloy Lafuente (stronk7) d24f96a248 MDL-66902 tests: Fix all incorrect namespaces
This issue just goes over all the currently incorrect
namespaces in test cases and:

1. Change the namespace to the correct one.
2. Move/rename it to correct location if needed (level 2 and down).
3. Remove not needed MOODLE_INTERNAL check when possible.
4. Remove file phpdoc when the file only has one class.
5. Make small adjustments in case the change of namespace requires it.
2022-09-26 14:30:41 +02:00
sam marshall 76c7206927 MDL-75738 tool_moodlenet: Upgrade clean user profile slow, pointless
There is an upgrade to clean the moodlenetprofile field which
performs very poorly, but it is also not needed because an upgrade
further down sets this field to empty string anyway.
2022-09-26 11:25:50 +01:00
Hien Dinh b82b0f6ce5 MDL-72490 availability: Show error if conflict in date restriction 2022-09-26 11:20:51 +01:00
Paul Holden 9a68b6ea7e MDL-61395 forms: style frozen tag element values. 2022-09-26 11:16:04 +01:00
Paul Holden bd048774dd MDL-75656 tag: decode entities in tags element values. 2022-09-26 10:56:33 +01:00
Eloy Lafuente (stronk7) a67daf6b24 MDL-75726 ci: Bump GHA to Ubuntu 22.04
Have tried to also bump Travis to 22.04 (jammy) but it
was not working ok, with problems trying to find both
PHP and PostgreSQL versions.

Surely that's because 22.04 support is really new (Sep 9, 2022):

https://blog.travis-ci.com/22-9-9-ubuntujammy

So we'll have to wait a little more before being able to, also,
bump Travis to use 22.04
2022-09-22 17:45:10 +02:00
Eloy Lafuente (stronk7) da4772d234 MDL-75776 composer: minor updates
In stables, just minors updates to components.

Generated using the instructions @ https://docs.moodle.org/dev/Composer
and using PHP 7.3 (always the min version supported) to generate the
lock file.
2022-09-22 17:44:38 +02:00
Eloy Lafuente (stronk7) d708740c3f weekly release 4.0.4+ 2022-09-22 17:05:44 +02:00
Tim Hunt b20f6471b6 MDL-27570 quiz timing: add unit test and simplify top of process_attempt 2022-09-22 11:12:23 +01:00
Eloy Lafuente (stronk7) 84f03ab16d Merge branch 'MDL-74762_400' of https://github.com/catalyst/moodle-MDL-72752 into MOODLE_400_STABLE 2022-09-21 14:26:40 +02:00
Philipp Imhof bebdb51753 MDL-27570 quiz: check if time is really up 2022-09-21 11:38:24 +01:00
David Woloszyn 4f14495420 MDL-75459 Collapsable Form Sections: Default state bug fix
In circumstances where all collapsible form sections were expanded on
page load, a check is now made to ensure the expand all/collapse all
button behaves as intended.
2022-09-21 12:30:10 +10:00
Nathan Nguyen 1c843805eb MDL-74762 qbank_statistics: fix unit test failure with Oracle DB 2022-09-21 12:10:12 +10:00
Paul Holden d08559b8ae MDL-75800 enrol: correct instance deleted event name. 2022-09-20 14:09:34 +01:00
Jun Pataleta 1febfbebcd Merge branch 'MDL-75777_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-20 15:12:15 +08:00
Víctor Déniz ae317e6527 Merge branch 'MDL-74941-400' of https://github.com/lucaboesch/moodle into MOODLE_400_STABLE 2022-09-20 08:09:06 +01:00
Laurent David d74f805126 MDL-75763 mod_bigbluebuttonbn: Fix get_server_not_available_url
* The redirection should go to xxx?section=modsettingbigbluebuttonbn in case of error
2022-09-20 08:39:10 +02:00
Steve Bader 30cc7e5c1e MDL-74941 qtype_calculated: Copy dataset from previous question version 2022-09-20 08:09:13 +02:00
Luca Bösch 0acbe6914d MDL-74941 qtype_calculated: Fix for usage calculation
The patch for the helper functions is by Nathan Nguyen
<nathannguyen@catalyst-au.net> whom I wish to thank.
2022-09-20 08:09:02 +02:00
Marina Glancy 9ddc556300 MDL-75791 reportbuilder: set persistent for active conditions 2022-09-19 16:54:21 +02:00
Marina Glancy be60921e14 MDL-75358 reportbuilder: display nulls as empty cells in aggregation 2022-09-19 14:44:01 +02:00
Marina Glancy 4e8013e418 MDL-75358 reportbuilder: display nulls as empty cells for numeric/bool 2022-09-19 14:43:56 +02:00
Ilya Tregubov 236b14a90f Merge branch 'MDL-75065-401' of https://github.com/devlionco/moodle into MOODLE_400_STABLE 2022-09-19 14:01:36 +04:00
Eloy Lafuente (stronk7) be02cc3687 MDL-75777 phpunit: Move tests to use correct names and ns (take#6)
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.
2022-09-19 11:02:50 +02:00
Jun Pataleta 5bd5f5b4c9 Merge branch 'MDL-75757_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-19 13:01:57 +08:00
Andrew Nicols 493ef64d13 MDL-75782 mod_quiz: Make TinyMCE autosave less fragile
This commit amends the quiz autosave feature to not assume the
components of the Tiny API as much, and add support for newer versions
of TinyMCE.
2022-09-19 12:55:41 +08:00
Eloy Lafuente (stronk7) dff5793807 MDL-75757 phpunit: Add some tolerance to a few failing assertions
Recently, PHPUnit (all versions) did some changes about how the
comparators worked and this has caused some float comparisons
to stop working.

We need to move them to assertEqualsWithDelta(), allowing a small
tolerance to workaround the floats comparison problem.

0.00001 has been decided. And applied to all the similar assertions
within the unittest function, so if more cases are added to them
better be copied with the agreed tolerance.
2022-09-18 15:57:01 +02:00
Víctor Déniz 3657cfa88c Merge branch 'MDL-74762_400' of https://github.com/catalyst/moodle-MDL-72752 into MOODLE_400_STABLE 2022-09-16 14:24:53 +01:00
Nathan Nguyen 92f979948f MDL-74762 qbank_statistics: improve performance loading the data
This issue greatly improves the performance of displaying statistics in
the question bank.

1. The required quiz statistics are now pre-computed by a scheduled task.

2. Cached statistics in the database are now never cleaned up, so the
   pre-computed stats are always available.

3. The way the cached statistics are loaded for each question
   that is being displayed is now a bit more efficient.

4. Related to that, there is a new callback which activities can implement,
   if they want their question statistics to be included in the ones shown
   in the question bank.

Note, there is still further improvement possible to load the statistics
for all questions being displayed in bulk. However, that must wait for a
future issue, MDL-75576. The other improvements in this issue are
significant and we did not want to delay releasing them.

Co-authored-by: Jonathan Champ <jrchamp@ncsu.edu>
Co-authored-by: Tim Hunt <t.j.hunt@open.ac.uk>
2022-09-16 21:15:27 +10:00
Sara Arjona 5b90f71153 Merge branch 'MDL-75108-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-09-16 11:23:21 +02:00
Paul Holden 3e97c3ee83 MDL-75721 reportbuilder: select from main table in absence of columns.
Ensure any joins added to the report itself are also present.
2022-09-15 17:07:20 +01:00
Sara Arjona 844abeaf5d weekly release 4.0.4+ 2022-09-15 16:11:51 +02:00
Sara Arjona e7e0609857 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-09-15 16:11:49 +02:00
hieuvu 3b1ef88cb4 MDL-75744 gapselect: remove empty choices option. 2022-09-15 15:45:35 +07:00
Andrew Nicols 049288a65d MDL-71531 cachestore_file: Stop locking cache files to read
The cache file is only ever written to in the `write_file` function,
where it does so by writing to a temp file and performing an atomic
rename of that file. When writing, the target file is never locked.

The cache file is only ever read in the `get` function, and there is no
need for an exclusive lock in that situation.

There is therefore no need to obtain any lock, shared or exclusive, to
read the cache file. Doing so only affects performance of the file sytem
as file locks must be needlessly obtained and written to disk for a read
operation which does not benefit from them.
2022-09-15 10:14:00 +08:00
Jun Pataleta f5f40abd28 Merge branch 'MDL-75716_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-15 09:55:48 +08:00
Jun Pataleta 24a00a0d97 Merge branch 'MDL-75714_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-15 09:26:13 +08:00
Eloy Lafuente (stronk7) 6e672c0a82 MDL-75714 navigation: Cover a couple of situations with behat
- Guest user attempting to access to single-activity course.
- Not enrolled user attempt to access to single-activity course.

Both should, by default, land to the "cannot access/enrol" page.
2022-09-14 23:41:25 +02:00
Stefan Hanauska ed369e32ef MDL-75714 navigation: Check if node is false 2022-09-14 23:41:25 +02:00
Víctor Déniz fb049600c3 Merge branch 'MDL-75558-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-09-14 22:33:57 +01:00
Víctor Déniz a19e234dd3 Merge branch 'MDL-74965-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-09-14 20:23:01 +01:00
Ferran Recio 5d6d91b706 MDL-75625 core_courseformat: fix MDL-71979 comments 2022-09-14 20:05:32 +01:00
Marina Glancy bf896b01dc MDL-71686 forms: allow arrays in dynamic forms args 2022-09-14 17:59:10 +02:00
Shamiso.Jaravaza 8f090ac85d MDL-74965 mod_bigbluebuttonbn: Fix error in role 2022-09-14 09:06:00 -06:00
Sara Arjona 49705b1f40 Merge branch 'MDL-74010-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-14 11:41:47 +02:00
Paul Holden 4bd6777cfb MDL-75729 reportbuilder: improve handling of card toggle button. 2022-09-14 10:18:55 +01:00
Jun Pataleta 497e9da529 Merge branch 'MDL-75308-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-14 05:32:57 +08:00
Eloy Lafuente (stronk7) ad01614e9c MDL-75716 phpunit: Move tests to use correct names and ns (take#5)
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.

Special mention to:

- In lib/tests/blocklib_test.php 2 helper classes have been
  moved to tests/fixtures, because they needed to be namespace-free.
2022-09-12 19:29:11 +02:00
Sara Arjona 152bdb1aa1 Merge branch 'MDL-75051_400' of https://github.com/mkassaei/moodle into MOODLE_400_STABLE 2022-09-12 12:30:31 +02:00
Andrew Nicols 0a63b5c08d MDL-75559 behat: Sort behat_hooks to top of context list 2022-09-12 12:33:31 +08:00
AMOS bot 0693f196e7 Automatically generated installer lang files 2022-09-11 00:07:58 +00:00
Eloy Lafuente (stronk7) 8febbe3973 Moodle release 4.0.4 2022-09-10 12:15:57 +02:00
Jun Pataleta f4172c491c Merge branch 'MDL-75708-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-09 20:49:04 +08:00
Paul Holden 190558640e MDL-75708 reportbuilder: consider stress tests as requiring longtest.
We should respect the value of the PHPUNIT_LONGTEST constant in the
report source stress tests, as it was discovered after 165e26fa that
the default configuration of some CIs (GHA) was not sufficient to run
them.

Hence, use the PHPUNIT_LONGTEST to determine whether to execute said
tests. Note this constant is enabled on internal CI.
2022-09-09 11:18:55 +01:00
Mahmoud Kassaei 7c7505e428 MDL-75051 Questions: Selecting idnumber in the question bank,
the copy/pasting, includes extraneous text in Chrome
2022-09-09 10:35:55 +01:00
Jun Pataleta 5b90938614 weekly release 4.0.3+ 2022-09-09 08:36:47 +08:00
Jun Pataleta 306fe2e5d8 Merge branch 'MDL-75227-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-09-08 09:39:45 +08:00
Jun Pataleta 02425dd8d6 Merge branch 'MDL-74081-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-09-08 09:04:54 +08:00
Michael Hawkins 4b434b3264 MDL-68066 output: Apply disable lambda rendering to Mustache renderer 2022-09-07 23:56:29 +08:00
Lars Bonczek ec77ff8474 MDL-68066 output: Mustache - Add option to disable lambda rendering
This commit is based on an outstanding pull request to the Mustache repo
2022-09-07 23:56:29 +08:00
Laurent David 52ae580ad6 MDL-75227 mod_bigbluebuttonbn: Optimize User logs retrieval
* When loading a course with the Recent Activity block the bigbluebuttonbn_print_recent_activity
takes too much time to load the logs. Using the courseid (index of log table) improves the
time taken by the query.
2022-09-07 17:38:06 +02:00
Laurent David 4519964111 MDL-74081 mod_bigbluebuttonbn: Fix codechecker related issues
* Opening braces should be on the same line
* Unwanted MOODLE_INTERNAL
* Behat edit_instance.feature should use "activity editing" page locator
* Coverage indication
2022-09-07 17:27:58 +02:00
Paul Holden f0d5a81699 MDL-72012 mod_h5pactivity: respect user access when getting report. 2022-09-07 22:10:41 +08:00
Jun Pataleta 92c332f491 MDL-75283 core: Fetch proper column mapping for sort
Calling \core_user\fields::get_sql() incerements a static uniqueid
variable. This should be called only once and not make a separate call
for the sort mapping data as it doing so will result to an incorrect
table alias for the sort mapping data.
2022-09-07 17:11:53 +04:00
Ilya Tregubov 49b55a357a Merge branch 'MDL-75555-400' of https://github.com/justusdieckmann/moodle into MOODLE_400_STABLE 2022-09-07 16:37:18 +04:00
Ilya Tregubov ffc2b63cd1 Merge branch 'MDL-74782-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-09-07 15:49:35 +04:00
Sara Arjona e20149a2b4 Merge branch 'MDL-74866-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-09-07 13:10:17 +02:00
stevando b3041d3a0f MDL-75283 admin: Update admin user fetching to use sort helper 2022-09-07 13:18:29 +08:00
Jun Pataleta 2190e59647 Merge branch 'MDL-75553-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-09-07 12:59:34 +08:00
Jun Pataleta 74b24ddc5f MDL-75553 mod_data: Fix wording of data fields in Behat tests 2022-09-07 12:57:18 +08:00
Huong Nguyen c4b1115e8c MDL-74866 bennu: Fix parameter parsing
Some parameter values are wrapped by DQUOTE character.
We need to go through and get the actual value inside the quoted string.
2022-09-07 11:15:52 +07:00
Dan Marsden 4603578b43 MDL-75668 backup: Save context mapping of duplicate blocks. 2022-09-07 12:40:20 +12:00
Paul Holden ab69d5373f MDL-75405 block_html: safer unserialize during old block conversion. 2022-09-07 00:45:20 +02:00
Jun Pataleta 89ee7a5fb7 Merge branch 'MDL-74749-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-09-07 06:40:21 +08:00
Jun Pataleta bd211c77e6 MDL-74749 mod_bigbluebuttonbn: Run import button check scenario in nonJS 2022-09-07 06:39:45 +08:00
Shamiso.Jaravaza a49411b80c MDL-74749 mod_bigbluebuttonbn: Fix import button 2022-09-07 06:39:45 +08:00
David Mudrák a920cd70e3 MDL-75553 lang: Fix Behat regressions in scenario files 2022-09-06 21:48:14 +02:00
Jun Pataleta f47c75b8ae Merge branch 'MDL-75311_400' of https://github.com/lostrogit/moodle into MOODLE_400_STABLE 2022-09-07 00:19:12 +08:00
Jun Pataleta 796962c848 Merge branch 'MDL-75231-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-09-06 23:49:20 +08:00
Jun Pataleta 53a7ba2c5a Merge branch 'MDL-75040-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-06 21:49:30 +08:00
Ilya Tregubov 383581d276 Merge branch 'MDL-73938-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-06 14:29:11 +04:00
Sara Arjona d8f9c2f2a3 Merge branch 'MDL-75548_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-09-05 13:09:45 +02:00
Paul Holden bded9dee9d MDL-73938 reportbuilder: better Oracle support of long text columns.
Specifically during column grouping/aggregation, we need to avoid CLOB
datatype inconsistencies (ORA-00932).
2022-09-05 12:08:57 +01:00
Paul Holden c507f660f7 MDL-73938 reportbuilder: helper methods for automating report tests.
Implement stress tester methods for iterating over report columns,
aggregation and conditions. Assert that each works correctly in
isolation, and when used in conjunction with other columns.
2022-09-05 12:07:13 +01:00
Ilya Tregubov c04f9ad6b3 Merge branch 'MDL-60666-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-09-05 14:37:36 +04:00
Sara Arjona 0b319d563b Merge branch 'MDL-75608-m400' of https://github.com/sammarshallou/moodle into MOODLE_400_STABLE 2022-09-05 12:25:04 +02:00
Peter Sistrom 03f4fb4c74 MDL-60666 auth_ldap: One transaction per user 2022-09-05 14:22:43 +04:00
Paul Holden 459334249b MDL-73938 reportbuilder: add filters API to support stress testing.
Filter types can now define sample values, to be used in forthcoming
stress test helpers, in order for them to become active in a report.
2022-09-05 11:15:30 +01:00
Sara Arjona 6846949785 Merge branch 'MDL-75550-400' of https://github.com/mickhawkins/moodle into MOODLE_400_STABLE 2022-09-05 08:57:31 +02:00
Sara Arjona 26af1b6723 Merge branch 'MDL-75199-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-09-05 08:43:53 +02:00
Jun Pataleta 651bf5711d Merge branch 'MDL-75641_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-09-05 14:37:21 +08:00
Helen Foster 132dba3ed2 MDL-75553 lang: Import fixed English strings (en_fix) 2022-09-04 20:49:22 +02:00
Eloy Lafuente (stronk7) 8b0fa0dc75 MDL-75641 core_lang: Add string for new Europe/Kyiv timezone
With IANA TZDB (timezone database) release 2022b, Europe/Kiev
has been renamed to Europe/Kyiv. So we need to add this string
to our list to keep tests passing.

Note that the old Europe/Kiev continues working (is an alias) and,
also, there are places in core where we are using it. Just we cannot
remove/replace those uses in core until we ensure that everybody is
using PHP 8.0.23 (TZDB 2022b) or more recent versions. Hence,
not changing those uses now.
2022-09-04 10:11:39 +02:00
Paul Holden 2ae6bde9dc MDL-75447 reportbuilder: return only valid audience instances. 2022-09-02 12:33:59 +01:00
Ilya Tregubov b2e9ca957a weekly release 4.0.3+ 2022-09-02 08:49:16 +04:00
Brendan Heywood 65d259ef55 MDL-75614 dml: Fixed debugsqltrace with anon classes bug 2022-09-02 11:42:31 +10:00
Jun Pataleta abca7c9ba0 Merge branch 'MDL-74770-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-09-01 11:32:08 +08:00
Jun Pataleta d50f0c1af6 Merge branch 'MDL-75092-MOODLE_400_STABLE' of https://github.com/PhMemmel/moodle into MOODLE_400_STABLE 2022-09-01 11:05:09 +08:00
Laurent David 5f396bff51 MDL-75199 mod_bigbluebuttonbn: Add CLI command to migrate recordings
* Sometimes recordings are not migrated when upgrating from pre-4.0 release
version. The additional script will allow to launch the migration once again
either for specific courses or activities.
2022-08-31 17:42:16 +02:00
Jun Pataleta aa9ee6b727 Merge branch 'MDL-75111_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-08-31 23:05:53 +08:00
Sara Arjona 347054c624 Merge branch 'MDL-73076-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-08-31 15:45:35 +02:00
Jun Pataleta 842db17331 Merge branch 'MDL-75019-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-08-31 20:25:17 +08:00
Ilya Tregubov 9b2a17d6cb Merge branch 'MDL-74901-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-08-31 16:01:13 +04:00
Marina Glancy 1d926fabd4 MDL-74969 core_form: same style for headers without shortforms 2022-08-31 12:29:37 +02:00
Paul Holden c2083cdfc1 MDL-75040 block_completionstatus: correct current course navigation. 2022-08-31 09:56:32 +01:00
Ilya Tregubov b3b2fb4681 Merge branch 'MDL-74861-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-08-31 11:52:51 +04:00
Michael Hawkins f238d324af MDL-75550 lib: Update Mustache const to reflect correct version
Mustache version 2.14.1 is already included, but the VERSION const
incorrectly listed 2.14.0 in the tagged Mustache release. A later
upstream commit corrected this in the library, which this now matches.
2022-08-31 15:29:44 +08:00
Sara Arjona 96d1fbcaa5 Merge branch 'MDL-74873-m400' of https://github.com/dthies/moodle into MOODLE_400_STABLE 2022-08-30 16:10:14 +02:00
Sara Arjona 401c26aa38 Merge branch 'MDL-68717-400' of https://github.com/laurentdavid/moodle into MOODLE_400_STABLE 2022-08-30 16:05:04 +02:00
Paul Holden fc0bd43f9d MDL-75308 task: explicit check for tasks of disabled plugins.
The enabled state of a plugin is a tri-state value (boolean or
null). We should be consistent with elsewhere by only considering
boolean false as an actually disabled plugin.

See also cdcb53a1 for similar change in task management.
2022-08-30 13:03:52 +01:00
Víctor Déniz 76102e0f11 Merge branch 'MDL-75360-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-30 11:43:10 +01:00
sam marshall 630ccf76e3 MDL-75608 Behat: Expand all fieldsets step fails with single fieldset 2022-08-30 11:18:36 +01:00
Jun Pataleta 6f01131eeb MDL-70480 mod_assign: Apply proper upgrade savepoint version 2022-08-30 17:20:22 +08:00
Jun Pataleta 231a77fb58 MDL-70480 mod_assign: Bump version.php properly 2022-08-30 17:02:35 +08:00
Víctor Déniz e61ec8f0a8 Merge branch 'MDL-70480-400' of https://github.com/chanqihui/moodle into MOODLE_400_STABLE 2022-08-30 09:16:15 +01:00
Ilya Tregubov 0022f54de5 Merge branch 'MDL-71662-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-30 08:00:08 +04:00
Jun Pataleta e198efde5a Merge branch 'MDL-73685-admin-role-bug-MOODLE_400_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_400_STABLE 2022-08-29 15:47:49 +08:00
Eloy Lafuente (stronk7) 5c884e835e MDL-75111 phpunit: Move tests to use correct names and ns (take#4)
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.

Special mention to:

- The following task tests have been moved within the level2 directory:
  - \core\adhoc_task_test => \core\task\adhoc_task_test
  - \core\scheduled_task_test => \core\task\scheduled_task_test
  - \core\calendar_cron_task_test => \core\task\calendar_cron_task_test
  - \core\h5p_get_content_types_task_test => \core\task\h5p_get_content_types_task_test
  - \core\task_database_logger_test => \core\task\database_logger_test
  - \core\task_logging_test => \core\task\logging_test

- The following event tests have been moved within level2 directory:
  - \core\event_context_locked_test => \core\event\context_locked_test
  - \core\event_deprecated_test => \core\event\deprecated_test
  - \core\event_grade_deleted_test => \core\event\grade_deleted_test
  - \core\event_profile_field_test => \core\event\profile_field_test
  - \core\event_unknown_logged_test => \core\event\unknown_logged_test
  - \core\event_user_graded_test => \core\event\user_graded_test
  - \core\event_user_password_updated_test => \core\event\user_password_updated_test

- The following output tests have been moved within level2 directory:
  - \core\mustache_template_finder_test => \core\output\mustache_template_finder_test
  - \core\mustache_template_source_loader_test => \core\output\mustache_template_source_loader_test
  - \core\output_mustache_helper_collection_test => \core\output\mustache_helper_collection_test

- The following tests have been moved to their correct tests directories:
  - lib/tests/time_splittings_test.php => analytics/tests/time_splittings_test.php

- All the classes and tests under lib/filebrowser and lib/filestorage
  belong to core, not to core_files. Some day we should move
  them to their correct subsystem.
- All the classes and tests under lib/grade belong to core, not
  to core_grades. Some day we should move them to their correct
  subsystem.
- The core_grades_external class and its \core\grades_external_test
  unit test should belong to the grades subsystem or, alternatively,
  to \core\external, they both should be moved together.
- The core_grading_external class and its \core\grading_external_test
  unit test should belong to the grading subsystem or, alternatively,
  to \core\external, they both should be moved together.
- The \core\message\message and \core\message\inbound (may be others)
  classes, and their associated tests should go to the core_message
  subsystem.
- The core_user class, and its associated tests should go to the
  core_user subsystem.
- The \core\update namespace is plain wrong (update is not valid API)
  and needs action 1) create it or 2) move elsewhere.
2022-08-26 16:34:24 +02:00
Shamim Rezaie cd11b40558 weekly release 4.0.3+ 2022-08-26 21:07:38 +10:00
Justus Dieckmann d6ff7db956 MDL-75555 core_courseformat: Remove duplicate section collapse requests
Previously, by simulating a click, the section toggle listener
was invoked again. Instead, it now uses the bootstrap collapse
function directly.
2022-08-25 23:19:27 +02:00
Shamiso.Jaravaza d30eabf344 MDL-75558 mod_bigbluebuttonbn: Fix alert banner 2022-08-23 17:19:06 -06:00
Tim Hunt 9a0c490680 MDL-75548 misc: final Required parameter follows optional notices 2022-08-22 15:19:34 +01:00
Simey Lameze 0a3c2be3a7 MDL-75231 files: make bucket calculations more precise
This commit changes changes the unit test calculations to
keep track of the time the bucket starts/finishes bursting
and use milliseconds instead of seconds to have a precise
time to sleep.
2022-08-22 13:54:03 +08:00
Philipp Memmel e066c613c7 MDL-75092 backup: Fix selector for adding select all/none link 2022-08-19 17:23:13 +02:00
Sara Arjona 78f0557607 Moodle release 4.0.3 2022-08-19 09:50:23 +02:00
Mikhail Golenkov 02cca91bfe MDL-75448 assignfeedback_editpdf: Fix conversion for rotated images 2022-08-19 15:38:03 +10:00
Mikhail Golenkov c3474f0fb7 MDL-75448 stored_file: Cover rotate_image() method with unit tests 2022-08-19 15:38:03 +10:00
Paul Holden ae8059d346 MDL-74770 gradereport_grader: allow sorting by all user fields. 2022-08-18 15:58:17 +01:00
Sara Arjona dd1a805bae weekly release 4.0.2+ 2022-08-18 14:54:15 +02:00
Laurent David 00e3145a61 MDL-75210 mod_quiz: fix sequential quiz access
* As a student I should only be able to access the next question or the current question
* The API should not show more than the current question
* Once the quiz is previewed we can see the question in any order (existing behaviour)
* Related to ticket MDL-71728

Co-authored-by: Rajneel Totaram <rjnlfj@yahoo.com>
Co-authored-by: Tim Hunt <t.j.hunt@open.ac.uk>
2022-08-18 08:08:00 +04:00
Brendan Heywood 9b77e1974c MDL-73685 admin: Fix regression from MDL-69498 2022-08-18 13:57:40 +10:00
Andrew Nicols dfb8817998 Merge branch 'MDL-75029-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-18 11:17:43 +08:00
Sara Arjona 76e2b6ef9f Merge branch 'MDL-75063-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-08-17 16:53:10 +02:00
Sara Arjona d5c66fa1a4 Merge branch 'MDL-75312-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-17 12:26:44 +02:00
Shamim Rezaie e9a7520a17 Merge branch 'MDL-75386-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-08-17 13:29:28 +10:00
Shamim Rezaie c13b24dcaa Merge branch 'MDL-73876-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-08-17 02:32:27 +10:00
Sara Arjona db67f81aa6 Merge branch 'MDL-72178-400' of https://github.com/NoelDeMartin/moodle into MOODLE_400_STABLE 2022-08-16 16:58:35 +02:00
Shamiso.Jaravaza 0e27c5f7a5 MDL-75460 mod_bigbluebuttonbn: Fix lock on start 2022-08-15 23:51:21 -06:00
Laurent David c84606f5a7 MDL-59458 mod_data: Fix sorting data query
* When activating sorting on a different field than the original field
the list of records is empty
2022-08-15 17:13:28 +02:00
Simey Lameze 547a925d39 MDL-73076 completion: split criteria duration test into two tests 2022-08-12 17:13:11 +08:00
Mark Johnson e851106c8f MDL-75388 lib: Update mustache to 2.14.1
MDL-67114 and MDL-73586 local changes removed as they are now available
upstream.
2022-08-12 04:15:20 +02:00
Petr Skoda 754b7af680 MDL-75237 core: improve PARAM_SAFEPATH docs 2022-08-12 04:15:20 +02:00
Petr Skoda d0fd8c6ff4 MDL-75237 qformat_blackboard_six: sanitise blackboard import file paths 2022-08-12 04:15:20 +02:00
Petr Skoda b0388fdc49 MDL-75237 core: Revert MDL-72029
This reverts commit a212b1ec3e.
2022-08-12 04:15:20 +02:00
Petr Skoda 3cbcba14ca MDL-75237 qformat_blackboard_six: Revert MDL-72029
This reverts commit f38397544a.
2022-08-12 04:15:19 +02:00
Paul Holden cdbdc89b32 MDL-75326 h5p: require sesskey to toggle library enabled state. 2022-08-12 04:15:19 +02:00
Shamim Rezaie bcd0bdaf51 weekly release 4.0.2+ 2022-08-12 11:52:51 +10:00
Daniel Thies 1b5c8d3be1 MDL-74873 core_message: Disable notification preferences controls 2022-08-11 12:36:33 -05:00
Noel De Martin d53fbbdd5c MDL-72178 feedback: Implement behat generators
Based on Andrew's WIP from https://github.com/andrewnicols/moodle/commit/b3d40cb20d1f0edf0bf21077c8f94bce5dec56db

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2022-08-11 10:49:41 +02:00
Anton b674666081 MDL-75065 qbank_editquestion: fix creating simple calculated question 2022-08-10 09:43:33 +03:00
Jun Pataleta cb0ab077ff Merge branch 'MDL-75375-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-08-10 00:25:55 +08:00
Brendan Heywood 4e3b6edaaf MDL-75375 cache: Fix file store path cleaning 2022-08-09 23:53:55 +08:00
Jun Pataleta 66401fdedb Merge branch 'MDL-74636_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-08-09 11:11:11 +08:00
Jun Pataleta a3d771cdca Merge branch 'MDL-74800-400' of https://github.com/ferranrecio/moodle into MOODLE_400_STABLE 2022-08-08 22:34:12 +08:00
Jun Pataleta a034c10238 MDL-74800 core: block actions fix suggestion 2022-08-08 14:51:28 +02:00
Jun Pataleta 1a7939778b MDL-74800 core: action menu role fix
The action menu could have a role button or menubar depending on the
number of options available.
2022-08-08 14:51:28 +02:00
Ferran Recio 68b3f1e4a7 MDL-74800 core_courseformat: fix accessibility checks 2022-08-08 14:51:23 +02:00
Ferran Recio 357960c02f MDL-74800 output: fix edit button accessibility 2022-08-08 14:49:01 +02:00
Ferran Recio 798edb457c MDL-74800 message: fix invalid aria-label attributes 2022-08-08 14:49:01 +02:00
Laurent David ce372c1185 MDL-68717 core_calendar: Hide completed event
* "expectcompletionon" type of event should be hidden if the related
activity is completed
2022-08-08 07:18:57 +02:00
Jun Pataleta 4e0aa8af6c Merge branch 'MDL-74211-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-08-08 11:14:52 +08:00
Shamiso.Jaravaza 013378277a MDL-74782 mod_bigbluebuttonbn: Fix only imported
* When Show imported links only is enabled in activity or config, only imported recordings will appear
* Logic for activity/default overrides implemented
2022-08-05 09:58:53 -06:00
Paul Holden 59ce247b72 MDL-74010 core: check defined MDL_PERF* values in conditionals. 2022-08-05 11:03:02 +01:00
Angelia Dela Cruz 9dca9da48c MDL-75063 behat: BigBlueButton behat generators use UI
Replace steps that manually add BigBlueButton instances via the UI
and use Behat generators. This improves the speed of the Behat test
runs.

Co-authored-by: Simey Lameze <simey@moodle.com>
2022-08-05 17:29:51 +08:00
Ilya Tregubov ee48012f9c Merge branch 'MDL-74475-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-08-05 12:26:37 +04:00
Andrew Nicols a9a1791fe7 MDL-75386 theme: Include CSS from editor subplugins in editor style
Editor stylesheets are kept separately to standard plugin stylesheets so
that they can be provided to style individual iframes where loading the
standard Moodle stylesheets would be incorrect.

Unfortunately the editor stylesheet system does not consider that
subplugins may want to add small individual styling to the editor but
this is required in some situations.
2022-08-05 14:18:42 +08:00
Angelia Dela Cruz 1f464b4045 MDL-75019 behat: Folder behat generators use UI
Replace steps that manually add Folder instances via the UI and
use Behat generators. This improves the speed of the Behat test
runs.
2022-08-05 14:06:06 +08:00
Ilya Tregubov 8eb4217a49 weekly release 4.0.2+ 2022-08-05 08:29:17 +04:00
Andrew Lyons eb1ea16009 MDL-73876 behat: Show exceptions stack trace 2022-08-04 16:51:44 +04:00
Paul Holden b9277ef5e2 MDL-75029 block_news_items: indicate posts made by deleted users. 2022-08-04 09:43:23 +01:00
Qihui Chan 57d91f1f2a MDL-70480 mod_assign: fix user and group submission and update database 2022-08-04 18:06:01 +10:00
Jun Pataleta 61421c7930 Merge branch 'MDL-74895-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-04 11:35:39 +08:00
Jun Pataleta 287d2a5e12 Merge branch 'MDL-69251-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-08-04 11:16:13 +08:00
Andrew Nicols ff60bfb0bf Merge branch 'MDL-56923-400' of https://github.com/rezaies/moodle into MOODLE_400_STABLE 2022-08-04 11:12:56 +08:00
Andrew Nicols 8a79df8f2a Merge branch 'MDL-74502-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-08-04 11:08:58 +08:00
Jake Dallimore f5342a222d Merge branch 'MDL-74766-400' of https://github.com/JBThong/moodle into MOODLE_400_STABLE 2022-08-04 10:59:37 +08:00
Andrew Nicols 1cc0b4832d Merge branch 'MDL-75080-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-08-04 10:44:51 +08:00
Andrew Nicols 3363d697f6 Merge branch 'MDL-74655-400' of https://github.com/NoelDeMartin/moodle into MOODLE_400_STABLE 2022-08-04 10:08:46 +08:00
Andrew Nicols b1837e6cf9 MDL-74492 editor_atto: Comment the regex change 2022-08-04 10:04:59 +08:00
Philipp Imhof 4fecc12ea1 MDL-74492 editor_atto: <line> tags should not be confused with <li> tags 2022-08-04 10:04:59 +08:00
Simey Lameze 2937e76650 MDL-74211 behat: convert few more steps to use new data generators 2022-08-04 09:47:08 +08:00
Simey Lameze b1f8463bc1 MDL-74211 behat: replace steps to use new categories page type 2022-08-04 09:47:08 +08:00
Simey Lameze 1947886e0e MDL-74211 behat: add course question categories page type 2022-08-04 09:47:08 +08:00
Simey Lameze 38d68b8f3e MDL-74211 quiz: make use of question data generators 2022-08-04 09:47:08 +08:00
Paul Holden 1a225bc908 MDL-71662 mod_h5pactivity: add group filter to attempts report. 2022-08-03 15:30:42 +01:00
Ilya Tregubov c4b3e06f8a Merge branch 'MDL-75185-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-03 16:27:46 +04:00
Jun Pataleta 9ff2f0d7de Merge branch 'MDL-75285-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-08-03 18:04:05 +08:00
Jun Pataleta e9ae523134 Merge branch 'MDL-74740-400-1' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-08-03 17:03:50 +08:00
Jun Pataleta 16c5a3a0dd Merge branch 'MDL-62959-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-08-03 16:52:04 +08:00
Noel De Martin 8dae0dec69 MDL-74655 competency: Implement behat generators 2022-08-03 10:48:36 +02:00
Amaia Anabitarte e839fe812d MDL-74475 core_badges: Behat test using new step 2022-08-03 10:36:08 +02:00
Amaia Anabitarte f164065979 MDL-74475 behat: Option to jump to course edit page 2022-08-03 10:36:08 +02:00
Andrew Nicols 58dd489eae Merge branch 'MDL-72430-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-08-03 12:49:35 +08:00
Paul Holden ba1c2e8d86 MDL-75360 user: relax initial parameter types of external method.
Defer cleaning of supplied text to inside the method, so we don't
throw confusing exceptions if a user enters "unsafe" characters in
the form input.
2022-08-02 21:04:34 +01:00
Jun Pataleta 05875057c6 Merge branch 'MDL-75205-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-08-02 23:18:21 +08:00
Paul Holden 8ee995dfad MDL-75205 reportbuilder: include report parameters on filters reset.
When resetting report filters, we need to include the original report
parameters in the external method call to ensure all those that are
required during validation are present (e.g. when determining if user
can view the current system report).
2022-08-02 12:43:55 +01:00
Jun Pataleta f313b73822 Merge branch 'MDL-74947-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-08-02 10:00:44 +08:00
Marina Glancy 492bac151d MDL-75285 core_reportbuilder: allow left joins on category entity 2022-07-29 12:48:20 +02:00
Tim Hunt 241b6628f5 MDL-74636 behat: step to skip this scenario if a plugin isn't installed 2022-07-29 09:49:09 +01:00
Jun Pataleta 5f68f288a0 Merge branch 'MDL-75244-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-07-29 15:29:50 +08:00
Andrew Nicols 1c47240630 Merge branch 'MDL-72349_M400_update_strip_double_headers_function' of https://github.com/christina-roperto/moodle into MOODLE_400_STABLE 2022-07-29 12:11:56 +08:00
Jun Pataleta a866652ea4 weekly release 4.0.2+ 2022-07-29 10:56:42 +08:00
Angelia Dela Cruz 80b9cafca8 MDL-75080 behat: Chat behat generators use UI
Replace steps that manually add Chat instances via the UI and use
Behat generators. This improves the speed of the Behat test runs.
2022-07-29 10:25:54 +08:00
Andrew Nicols b81c83e461 MDL-75244 form: Change checker should check existence of tinyMCE API
The window.tinyMCE.editors API was present in version 3 of TinyMCE, but
is not present in later versions. As a result, this check tries to loop
over a variable which does not exist and throws an error in the process.

We should check that window.tinyMCE *and* window.tinyMCE.editors both
exist before attempting to loop over them.
2022-07-28 16:09:21 +08:00
Carlos Castillo 8eee29fb93 MDL-75311 reportbuilder: Fix error when send report schedule 2022-07-27 08:52:44 -05:00
Jun Pataleta b360784c5b Merge branch 'MDL-74964-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-07-27 17:12:56 +08:00
Jun Pataleta 306a4e04aa Merge branch 'MDL-74656-400-fix' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-27 16:37:38 +08:00
Simey Lameze 092213c80d MDL-62959 calendar: add behat to test event type changing 2022-07-27 15:45:11 +08:00
Paul Holden 321a8cb0ca MDL-74656 reportbuilder: cast fields to char on mssql during concat. 2022-07-27 08:22:10 +01:00
Jun Pataleta 0f62627d13 Merge branch 'MDL-74808-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-07-27 13:22:03 +08:00
Simey Lameze 319a50649e MDL-62959 calendar: fix event data mapping for group id 2022-07-27 11:46:14 +08:00
Marina Glancy 5715b74d3a MDL-74964 core_enrol: enrolment page UI fixes 2022-07-27 08:18:10 +08:00
Paul Holden c83345aa11 MDL-75312 question: predictable ordering of available questions.
This solves sporadic test failure that tried to assert their order.
2022-07-26 17:12:51 +01:00
Jun Pataleta 9d03236862 Merge branch 'MDL-74656-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-26 20:03:17 +08:00
Huong Nguyen 1b40599fbf MDL-72430 Calendar: Fix admin cannot edit course event 2022-07-26 11:49:26 +07:00
Andrew Nicols 7cd2e70ec9 Merge branch 'MDL-73788-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-07-26 11:38:21 +08:00
Jun Pataleta 15d70438bc Merge branch 'MDL-74057-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-07-26 11:02:17 +08:00
Paul Holden eb5cce9b4e MDL-74895 h5p: more resilient error handling during content fetching.
On new installs, the task for downloading new H5P content types would
throw exceptions and exit when encountering unexpected and/or missing
data.
2022-07-25 20:05:38 +01:00
Ilya Tregubov c096179b1c Merge branch 'MDL-75083-MOODLE_400_STABLE' of https://github.com/rzhtwberlin/moodle into MOODLE_400_STABLE 2022-07-25 14:56:08 +04:00
Angelia Dela Cruz 1a6985d6e2 MDL-74057 behat: SCORM behat generators use UI
Replace steps that manually add SCORM instances via the UI and use
Behat generators. This improves the speed of Behat test runs.
2022-07-25 18:33:18 +08:00
Jake Dallimore ed09a5ace4 MDL-74901 core_navigation: support callbacks in frontpage secondary nav
Fixes the site home secondary nav, so that nodes added by plugins
implementing the PLUGIN_extend_navigation_frontpage callback can be
displayed for users who don't have the 'course:update' capability.
This change comprises:
- Removed course:update capability checks from site home (index.php)
and from the secondary nav view. This isn't needed since the nav is
capability aware.
- Fixed the initialisation of the secondary nav for the frontpage
course, removing erroneous duplicate 'home' nodes. The nav is now only
shown if there are nodes to display.
2022-07-25 15:06:54 +08:00
Thong Bui abb6bc93a6 MDL-74766 html_editor: Fix form is submitted as an empty string 2022-07-22 10:14:05 +07:00
Ilya Tregubov 2ccd0743fb weekly release 4.0.2+ 2022-07-21 21:29:51 +04:00
Ilya Tregubov 80f90252b9 NOBUG: Fixed SVG browser compatibility 2022-07-21 21:29:49 +04:00
Ilya Tregubov b5d567068c Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-07-21 21:29:49 +04:00
Jun Pataleta bfcaab9a0f Merge branch 'MDL-75181-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-07-21 11:59:31 +08:00
Jun Pataleta 350d1df507 Merge branch 'MDL-75208_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-07-21 11:27:01 +08:00
Víctor Déniz 0de2f98aaa Merge branch 'MDL-73332-400' of https://github.com/martygilbert/moodle into MOODLE_400_STABLE 2022-07-20 19:55:51 +01:00
Laurent David e658f9f04a MDL-75181 mod_bigbluebuttonbn: Fix activity completion exception
* Fix exception raised in core completion module due to the absence of
completionview in get_sort_order
2022-07-20 13:55:51 -04:00
Jun Pataleta 017833a2ab Merge branch 'MDL-75182-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-07-19 22:47:00 +08:00
Christina Thee Roperto 8c9179174d MDL-72349 filelib: update strip_double_headers function 2022-07-19 19:18:35 +10:00
Eloy Lafuente (stronk7) 8cb6079b4f MDL-75208 oracle: Amend a couple of queries to make Oracle happy
The changes introduced here are completely safe, just we stop
binding SITEID and, instead, embed it in the SQL.

Why? Because Oracle 21 has started to return non-sense results
when SITEID is bound.

After lots of tests, attempts, debugging... we have been unable
to find any logic to the need of this change and also, have been
unable to reproduce the problem with a standalone script that
pretty much runs the same queries that the ones changed here.

I'm sure that there is something, somewhere, but have failed
to find it, grrr.

Please read MDL-75208 and linked issues to find more information
about this problem, that is one of the biggest mysteries I've
seen recently. Maybe at the end there is a tiny detail that
explains it all, but it's really well hidden.
2022-07-19 09:52:31 +02:00
Paul Holden 39d606ec27 MDL-74656 reportbuilder: ensure nulls preserved in column callbacks.
When concatenating column fields in order to perform aggregation on
them (e.g. group concatenation), we need to preserve all null values
in the data passed to each column callback.

Co-authored-by: Carlos Castillo <carlos.castillo@moodle.com>
2022-07-19 08:42:30 +01:00
Ilya Tregubov d6cf61731e Merge branch 'MDL-68843-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-07-18 14:16:26 +04:00
Angelia Dela Cruz 9294b6a37f MDL-73788 behat: URL behat generators use UI
Replace steps that manually add URL instances via the UI and use
Behat generators. This improves the speed of Behat test runs.
2022-07-18 17:58:14 +08:00
Jun Pataleta 4525bada77 Merge branch 'MDL-74925-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-07-18 16:25:43 +08:00
Jake Dallimore 993cc8ff8a MDL-68843 enrol_lti: add tests covering disabled instances in tasks
Verify the expected behaviour of the sync_members and sync_grades tasks
when enrolment instances are disabled, whether as a byproduct of module
deletion, or as status change made by the user.
2022-07-18 16:25:30 +08:00
Jake Dallimore 5ac9ff15a0 MDL-68843 enrol_lti: auto disable orphaned enrolment instances
- pre_course_module_deletion hook to disable on mod delete
- upgrade step dealing with legacy orphaned records
2022-07-18 16:25:30 +08:00
Jake Dallimore 15eec33f91 MDL-68843 enrol_lti: add deleted activity warning to published tools
Adds a warning to the 'name' column of the tables, letting teachers know
that the activity exposed by the method has been deleted and what their
options are.
2022-07-18 16:25:30 +08:00
Simey Lameze 437db87b3e MDL-74925 course: use the correct 'remove' action 2022-07-18 14:50:43 +08:00
Simey Lameze 73d5d4d51f MDL-74925 phpunit: add missing course/format test suite 2022-07-18 14:50:43 +08:00
Jun Pataleta 7d36cf9b34 Merge branch 'MDL-74768-bulkmove-question-after-affects' of https://github.com/catalyst/moodle-MDL-72752 into MOODLE_400_STABLE 2022-07-18 13:49:58 +08:00
Shamim Rezaie 0483366b23 Merge branch 'MDL-74826-400' of https://github.com/rmady/moodle into MOODLE_400_STABLE 2022-07-18 12:19:42 +10:00
AMOS bot f374651109 Automatically generated installer lang files 2022-07-16 00:08:07 +00:00
Denis Brat fef4736613 MDL-69251 enrol_lti: fix sync_members task inconsistent internal state 2022-07-15 12:20:34 +08:00
Marty 4a27fe0a25 MDL-73332 mustache: Fix shortentext helper
In the docs, it claims you can provide length to
the shortentext template helper as a context variable.
In reality, that is not the case.
2022-07-14 09:36:13 -04:00
Víctor Déniz c1910fc822 weekly release 4.0.2+ 2022-07-14 12:06:06 +01:00
Víctor Déniz daf6a7c39e Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-07-14 12:06:03 +01:00
Safat Shahin fd82af2f5e MDL-74768 core_question: Fix for question category movement 2022-07-14 11:12:19 +10:00
Víctor Déniz 0fa050c328 Merge branch 'MDL-74671-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-14 01:46:25 +01:00
Víctor Déniz 890828d9b4 Merge branch 'MDL-74681-written_time_in_query_end_400' of https://github.com/catalyst/moodle into MOODLE_400_STABLE 2022-07-12 11:54:20 +01:00
Srdjan ffbea7e4fc MDL-74681 lib/dml: moodle_read_slave_trait: written table timestamping
Moved written table timestamping from query_start() to query_end():
We are adjusting table last written times at the end of transaction.
That does not apply to immediate database writes that are not performed
within transaction. This change is to set last written time after the query
has finished for such writes, rather than before it started. That way
long write operations cannot spill over the latency parameter.
2022-07-12 14:42:15 +10:00
Jun Pataleta de0773cb42 Merge branch 'MDL-74595-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-12 11:44:08 +08:00
Jun Pataleta b5fc4139c8 Merge branch 'MDL-71747_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-07-12 10:50:34 +08:00
AMOS bot 1dab36ae65 Automatically generated installer lang files 2022-07-12 00:08:03 +00:00
Jun Pataleta 60af848bb3 Merge branch 'MDL-74282-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-11 20:35:31 +08:00
Jun Pataleta cf7274f36e Merge branch 'MDL-73215-undef-plagiarismlinks-400' of https://github.com/leonstr/moodle into MOODLE_400_STABLE 2022-07-11 17:02:02 +08:00
Jun Pataleta 0476854339 Merge branch 'MDL-74784-400' of https://github.com/sarjona/moodle into MOODLE_400_STABLE 2022-07-11 16:53:58 +08:00
Jake Dallimore 25a9d276e1 MDL-74947 mod_lti: remove text validation from password field
This is a password field so should not be cleaned.
2022-07-11 13:38:52 +08:00
Johannes Burk cb5943094d MDL-75083 login: prevent double submission
Apply core_form/submit JavaScript code to prevent double submission of login form and guest login button.
Add ID to guest login button to make it addressable.
2022-07-08 16:28:46 +02:00
Paul Holden af0e9fd216 MDL-74282 grade: omit outcomes report if outcomes aren't enabled. 2022-07-08 10:43:34 +01:00
Paul Holden fdca502808 MDL-75185 reportbuilder: order report source listing alphabetically. 2022-07-08 10:07:18 +01:00
Simey Lameze 6f9a0826d7 MDL-74808 lib: replace type summary span by a div 2022-07-08 14:38:04 +08:00
Simey Lameze 8dc41648e3 MDL-74808 question: remove span element from label 2022-07-08 14:38:04 +08:00
Simey Lameze f62ae260f4 MDL-74808 question: only add title attr if tooltip is set 2022-07-08 14:38:04 +08:00
Simey Lameze fe7c20d157 MDL-74808 question: use the correct attr for checked checkboxes 2022-07-08 14:38:04 +08:00
Jake Dallimore d069cb9337 Moodle release 4.0.2 2022-07-08 11:28:34 +08:00
Jake Dallimore 30533452cf MDL-75182 enrol_lti: remove installed lang assumptions from unit tests
Don't assume 'fr' isn't installed, or that 'en' is. Use known
non-existent languages and known installed languages for the relevant
test cases.
2022-07-08 10:11:27 +08:00
Eloy Lafuente (stronk7) ee2e8890f8 MDL-71747 environment: Ensure that check_xmlrpc_usage is in >=39
This is a partial backport of MDL-73270 to ensure that the
check_xmlrpc_usage custom check is present in all the supported
branches and it's applied to all branches able to run php80:

- MOODLE_311_STABLE
- MOODLE_400_STABLE
- master (aka, 4.1 and up)

Note that the whole patch has not been backported, only the
environmental check (xml file and check implementation).
2022-07-07 23:45:39 +02:00
Eloy Lafuente (stronk7) 140f43198d MDL-71747 environment: Apply agreed changes
- PHP 7.4 required.
- Moodle 3.9 required.
- MariaDB 10.4 required.
- PostgreSQL 12 required.
- Oracle 19c required.
2022-07-07 19:19:49 +02:00
Eloy Lafuente (stronk7) ef8eeba26c MDL-71747 environment: 4.1 base information
This is a direct copy of the 4.0 information, to
have the changes under control in the next commit.
2022-07-07 19:19:49 +02:00
Jun Pataleta 93b132bbd1 weekly release 4.0.1+ 2022-07-07 21:33:04 +08:00
Jun Pataleta 27b19d4daa Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-07-07 21:33:03 +08:00
Shamim Rezaie 31ad2a3e0e MDL-56923 gradingform_guide: Fix icon positioning in RTL 2022-07-07 16:03:22 +10:00
Jun Pataleta 4d5fab8cf2 Merge branch 'MDL-75058-400' of https://github.com/jleyva/moodle into MOODLE_400_STABLE 2022-07-07 12:07:41 +08:00
Jake Dallimore d4af150760 Merge branch 'MDL-69400-400' of https://github.com/abgreeve/moodle into MOODLE_400_STABLE 2022-07-07 11:48:49 +08:00
Jun Pataleta 0ba63f8913 Merge branch 'MDL-74885-400' of https://github.com/dravek/moodle into MOODLE_400_STABLE 2022-07-07 11:01:31 +08:00
Jun Pataleta 4969af736f Merge branch 'MDL-75028-400' of https://github.com/rezaies/moodle into MOODLE_400_STABLE 2022-07-07 10:59:03 +08:00
Jun Pataleta 839740a522 Merge branch 'MDL-75116_400' of https://github.com/aolley/moodle into MOODLE_400_STABLE 2022-07-07 10:47:38 +08:00
Víctor Déniz ac87f038e2 Merge branch 'MDL-74981-400' of https://github.com/stevandoMoodle/moodle into MOODLE_400_STABLE 2022-07-07 00:50:07 +01:00
Víctor Déniz 0a6c734fab Merge branch 'MDL-74835-M400_update-nodejs-version-in-travis-integration-to-lts-gallium' of https://github.com/ziegenberg/moodle into MOODLE_400_STABLE 2022-07-06 12:17:36 +01:00
Jun Pataleta 62f71f1c81 Merge branch 'MDL-74741-400' of https://github.com/rezaies/moodle into MOODLE_400_STABLE 2022-07-06 16:45:59 +08:00
stevando 2cc78b27de MDL-72171 tool_mobile: Ensure auto login URL is always local 2022-07-06 14:27:10 +08:00
David Matamoros cca619f966 MDL-74885 reportbuilder: format value using percents from lang pack 2022-07-06 08:25:10 +02:00
Adrian Greeve 1bd32a28e8 MDL-69400 mod_forum: Added calender event refreshing. 2022-07-06 12:37:56 +08:00
Mihail Geshoski 7be2023401 MDL-71921 scorm: Sanitize element names before outputting track details 2022-07-06 05:25:29 +02:00
Alex Morris 0397ea7e59 MDL-75044 assignfeedback_editpdf: Add SAFER option to GS command
Adds the SAFER option to the Ghostscript command to limit interaction
with IO and OS commands
2022-07-06 05:25:29 +02:00
Huong Nguyen f38397544a MDL-72029 Lesson: Prevent arbitrary file read when importing lesson questions in blackboard format 2022-07-06 05:25:29 +02:00
Huong Nguyen a212b1ec3e MDL-72029 lib: Prevent path traversal for clean_param with PARAM_SAFEPATH 2022-07-06 05:25:29 +02:00
Laurent David 945e79573f MDL-74473 core_analytics: Upgrade ML Backend to 3.0.5 2022-07-06 05:25:29 +02:00
Jake Dallimore b327defe5d MDL-72299 mod_lti: fix html escaping when reposting cross site posts 2022-07-06 05:25:29 +02:00
Andrew Nicols 2f0c3f4f7d Merge branch 'MDL-73305_MOODLE_400_STABLE' of https://github.com/tasosb/moodle into MOODLE_400_STABLE 2022-07-06 11:16:10 +08:00
Andrew Nicols 7ff7ca5c6e Merge branch 'MDL-74408-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-07-06 11:02:41 +08:00
Andrew Nicols a5f36b8de2 Merge branch 'MDL-74972-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-07-06 10:58:16 +08:00
Jun Pataleta f99c21b543 Merge branch 'MDL-74813-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-07-06 10:53:34 +08:00
Mihail Geshoski 004ceed0c1 MDL-74813 filepicker: Replace the dnd gif animation with a static icon 2022-07-06 10:24:37 +08:00
Jun Pataleta 10b6240719 Merge branch 'MDL-74821-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-07-05 22:13:49 +08:00
Laurent David e475728710 MDL-74821 mod_feedback: Fix HTML validator error
* Remove align attribute on table elements
* Fix dangling tr/td on multichoice rated
* Remove colspan as it is not used
2022-07-05 21:46:53 +08:00
Jun Pataleta 634115240a Merge branch 'MDL-74505-400' of https://github.com/JBThong/moodle into MOODLE_400_STABLE 2022-07-05 21:15:28 +08:00
Jake Dallimore 5040b9b579 Merge branch 'MDL-74815-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-07-05 14:53:01 +08:00
Thong Bui 3d2ad7d76a MDL-74505 Question bank: Improve behat steps 2022-07-05 13:26:09 +07:00
Thong Bui 0b31712cf4 MDL-74505 Question bank: Update validation editing question form. 2022-07-05 13:26:08 +07:00
Jake Dallimore 573ee63a0e Merge branch '400_mdl-73498' of https://github.com/daniil-berg/moodle into MOODLE_400_STABLE 2022-07-05 12:01:04 +08:00
AMOS bot 580dfbaeaa Automatically generated installer lang files 2022-07-05 00:08:23 +00:00
Adam Olley e088975109 MDL-75116 mod_feedback: Check array values exist before using them
Without this, the @list will emit a PHP warning under php8.0+ when the array
doesn't have a second element to assign.
2022-07-05 09:17:47 +09:30
Jun Pataleta 63fa452f51 Merge branch 'MDL-74516_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-07-04 23:17:32 +08:00
Jun Pataleta 09e0ba70ec Merge branch 'MDL-75008-400-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_400_STABLE 2022-07-04 22:18:29 +08:00
Jun Pataleta 56ae87b4d2 MDL-74815 pix: Convert PNG version of darkened SVG icons
* Conversion was done using rsvg-convert from librsvg
2022-07-04 14:04:01 +08:00
Jun Pataleta 4572bf9827 MDL-74815 pix: Darken colour of grey icons
* Change the fill colour of grey icons from #999 to #888.
2022-07-04 14:04:01 +08:00
sam marshall 3c82c11f72 MDL-75108 block_html: Search tries to index directory entries
Search attach_files function should only attach indexable files,
not directory entries which are 0 bytes and cannot be indexed.
2022-07-01 14:09:51 +01:00
Eloy Lafuente (stronk7) 41f365d633 MDL-74516 workshop: Better handling of floats for gradepass fields
This re-applies the same fix that was used for the central mod form
to the workshop activity. This is needed because the completion
support for this module is custom (there are 2 grade items), hence
the validations are also custom.

For more information, read the previous commit and MDL-74516

Unfortunately, because of a related bug with assessment completion
(see MDL-69690) we cannot provide automated testing for this
activity. Manual instructions will be provided instead.
2022-07-01 13:55:53 +02:00
Eloy Lafuente (stronk7) feeac598b1 MDL-74516 activities: Better handling of floats for gradepass fields
Current code was relying on grade_floatval() that is not a validation
function. Instead, the gradepass field must be defined as proper float
and then perform the needed validations using unformat_float().

Note that the float element form has some particularities, see
MDL-73994 for more information and that makes us to have to check
for some values (null, zero) manually. Once that form element type
gets its behaviour fixed, the code will need to be revisited, hence
we have annotated it as comments for easier finding it in the future
(the same changes already were applied to other gradebook forms).

Also, remove an unreachable line of code (comparing with empty string)
within the grade_floatval() function because it's not possible anymore
to pass any string to it, as far as it's "?float" typed.

Covered as many cases with quiz completion as have been able to imagine.
2022-07-01 13:55:53 +02:00
Víctor Déniz bab7bdc53e weekly release 4.0.1+ 2022-07-01 11:28:41 +01:00
Marina Glancy 3c3090b6f9 MDL-74502 behat: when setting a field value it may not be visible
for example in case of editor field, the textarea element is hidden by wysiwyg widget but we still need to be able to set it
2022-07-01 10:31:21 +02:00
Andrew Nicols de95714ae0 Merge branch 'MDL-74841-400-fix' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-07-01 11:57:36 +08:00
Angelia Dela Cruz da07dbda3f MDL-74841 behat: Label behat generators use UI
Replace steps that manually add Label instances via the UI and use
Behat generators. This improves the speed of Behat test runs. Fix
for failing test.
2022-07-01 10:43:48 +08:00
David Mudrák 54c4cf6ac1 MDL-75008 lang: Use the fixed strings in Behat scenario files 2022-06-30 20:54:50 +02:00
Helen Foster 1e7d038247 MDL-75008 lang: Import fixed English strings (en_fix) 2022-06-30 20:54:50 +02:00
Mihail Geshoski 1a1684a6fc MDL-74740 boost: Display the skip links from the blocks drawer
Due to fixed positioning of the block drawer and the navbar, the
z-index css property on the skip link elements from the drawer
is not respected. This ultimately results in the skip links being
stacked behind the navbar. As a workaround, an absolute positioning
will be temporary applied to the block drawer once the current
focus is on an element within the drawer which will stack the
skip links infront of the navbar.
2022-07-01 01:22:45 +08:00
Shamim Rezaie 63c3c3f76e Merge branch 'MDL-74812-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-30 13:34:35 +10:00
Jun Pataleta 57d86b6a69 Merge branch 'MDL-75048-400' of https://github.com/jleyva/moodle into MOODLE_400_STABLE 2022-06-30 11:30:22 +08:00
Shamim Rezaie c47a4021df Merge branch 'MDL-75055-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-30 13:20:19 +10:00
Andrew Nicols 1294e283ad Merge branch 'MDL-75084-400' of https://github.com/NoelDeMartin/moodle into MOODLE_400_STABLE 2022-06-30 11:13:06 +08:00
Andrew Nicols 787fee79c8 Merge branch 'MDL-74613-400' of https://github.com/NoelDeMartin/moodle into MOODLE_400_STABLE 2022-06-30 11:04:35 +08:00
Andrew Nicols 64fa2930e5 Merge branch 'MDL-74220-400' of https://github.com/NoelDeMartin/moodle into MOODLE_400_STABLE 2022-06-30 10:59:32 +08:00
Andrew Nicols 60a5ecfe46 Merge branch 'MDL-74744-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-06-30 10:54:11 +08:00
Andrew Nicols b59920cce3 Merge branch 'MDL-74522-400' of https://github.com/devlionco/moodle into MOODLE_400_STABLE 2022-06-30 10:47:57 +08:00
Andrew Nicols db9a86ff42 Merge branch 'MDL-74841-400' of https://github.com/andelacruz/moodle into MOODLE_400_STABLE 2022-06-30 10:44:26 +08:00
Andrew Nicols 5463c97506 Merge branch 'MDL-72292-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-06-30 10:40:22 +08:00
Andrew Nicols 4fd50e8cd9 MDL-74379 core: Update date_format_string to use x-os functions 2022-06-30 10:35:41 +08:00
Andrew Nicols fe88f321a2 Merge branch 'MDL-74379_400' of https://github.com/aya-saad1/moodle into MOODLE_400_STABLE 2022-06-30 10:35:38 +08:00
Andrew Nicols 6f78835258 Merge branch 'MDL-74287-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-30 10:02:11 +08:00
Víctor Déniz 191c8452d3 Merge branch 'MDL-72885-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-29 18:23:00 +01:00
Jun Pataleta 2e1636bb52 Merge branch 'MDL74387_MOODLE_400_STABLE' of https://github.com/Amrita1991/moodle into MOODLE_400_STABLE 2022-06-29 23:20:49 +08:00
Jun Pataleta ebb328750a MDL-75055 templates: Apply .alert-dismissible class
- Apply the .alert-dismissible class for notification alerts with
close button to fix its positioning. As an added bonus, the
.alert-dismissible class also enlarges the clickable area of the
close button which is great for accessibility.
- Improve example context for the notification alerts templates.
2022-06-29 22:07:11 +08:00
Jun Pataleta 5523816c38 MDL-75055 theme_boost: Darken close button colour in notification alerts
This is in order for the close button to have a good contrast against
the alert background and meet the minimum Level AA contrast ratio of 3:1
2022-06-29 22:07:11 +08:00
Ilya Tregubov e3fe0299a1 Merge branch 'MDL-74548-400' of https://github.com/cameron1729/moodle into MOODLE_400_STABLE 2022-06-29 16:17:07 +04:00
Jun Pataleta ab2a97b33d Merge branch 'MDL-74632-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-06-29 18:06:50 +08:00
Anastasios Bithas 1bb9eb8467 MDL-73305 mod_folder: Download Folder in a mlang formated folder 2022-06-29 12:49:23 +03:00
Jun Pataleta 42a0b73dc1 Merge branch 'MDL-74886-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-06-29 17:47:02 +08:00
Jake Dallimore ced2e3aca6 Merge branch 'MDL-74674-400' of https://github.com/alfonso-salces/moodle into MOODLE_400_STABLE 2022-06-29 16:44:47 +08:00
Víctor Déniz 805bb41d5b Merge branch 'MDL-74742-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-29 09:32:51 +01:00
Alfonso Salces 50a2df69c3 MDL-74674 core: create notification generators 2022-06-29 10:31:24 +02:00
Noel De Martin 066459d375 MDL-75084 blog: Implement behat generators 2022-06-29 09:39:58 +02:00
Jake Dallimore 0551129c39 Merge branch 'MDL-74864-400' of https://github.com/dpalou/moodle into MOODLE_400_STABLE 2022-06-29 13:40:54 +08:00
Cameron Ball 59b6d343bf MDL-74548 backup: Deprecate get/set copy from base controller 2022-06-29 09:41:12 +08:00
Cameron Ball 2f22088b38 MDL-74548 backup: Deprecate core_backup\copy\copy 2022-06-29 09:41:12 +08:00
Cameron Ball 8516a494b6 MDL-74548 backup: Unit tests for course copy refactor 2022-06-29 09:35:58 +08:00
Cameron Ball 53dd76348c MDL-74548 backup: Refactor course copies
This patch modifies the way copy data is shared in order to mitigate potential race conditions
and ensure that the serialised controller stored in the DB is always in a valid state.

The restore controller is now considered the "source of truth" for all information about the
copy operation. Backup controllers can no longer contain information about course copies.

As copy creation is not atomic, it is still possible for copy controllers to become orphaned or
exist in an invalid state. To mitigate this the backup cleanup task has been modified to call
a new helper method copy_helper::cleanup_orphaned_copy_controllers.

Summary of changes in this patch:

    - Copy data must now be passed through the restore controller's constructor
    - base_controller::get_copy has been deprecated in favour of restore_controller::get_copy
    - base_controller::set_copy has been deprecated without replacement
    - core_backup\copy\copy has been deprecated, use copy_helper.class.php's copy_helper instead
    - backup_cleanup_task will now clean up orphaned controllers from copy operations that went awry

Thanks to Peter Burnett for assiting with testing this patch.
2022-06-29 09:35:58 +08:00
Jun Pataleta def51280c2 Merge branch 'MDL-74701-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-06-28 23:52:55 +08:00
Jun Pataleta 230e8d8485 Merge branch 'MDL-74906-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-06-28 23:33:13 +08:00
Shamim Rezaie 91b88a51a5 Merge branch 'MDL-73121-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-28 16:08:56 +10:00
Dani Palou cdcfa083ff MDL-74864 forum: Allow specifying group in discussions generator 2022-06-28 07:00:05 +02:00
Jun Pataleta 8a5e4412d9 Merge branch 'MDL-68867-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-06-28 11:24:04 +08:00
Jun Pataleta deae2cf2fd Merge branch 'MDL-74929-400' of https://github.com/bmbrands/moodle into MOODLE_400_STABLE 2022-06-28 11:07:39 +08:00
Jun Pataleta 5666c34237 Merge branch 'MDL-74781_400' of https://github.com/aya-saad1/moodle into MOODLE_400_STABLE 2022-06-28 10:44:59 +08:00
Juan Leyva 4535493590 MDL-75058 course: Fix support for dates on WebServices 2022-06-27 19:58:30 +02:00
Paul Holden c4ed6da1c5 MDL-74671 phpunit: remove file/directory coverage duplicates. 2022-06-27 10:16:22 +01:00
Ilya Tregubov 991056f698 Merge branch 'MDL-74691-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-06-27 08:30:49 +04:00
Aya Saad 937eab02f6 MDL-74781 search: Fix heading repetition in global search page 2022-06-26 10:37:59 +02:00
Aya Saad e6441d7fdb MDL-74379 language: injecting am/pm in date string
patching the date_format_string() function in moodlelib to add am/pm for languages that don't suuport it.
2022-06-26 10:36:29 +02:00
Paul Holden a12fbfae35 MDL-74595 calendar: consistent breadcrumbs navigating site calendar.
Take #3, see also 7a529cc8 and 81b0d053.
2022-06-24 10:14:56 +01:00
Shamim Rezaie 0074e485cd MDL-74741 javascript: Set the role of d&d links to button 2022-06-24 14:24:58 +10:00
Shamim Rezaie aa168505a9 MDL-74741 javascript: A11y fix for dialogues visible from beginning 2022-06-24 14:24:58 +10:00
Jun Pataleta bbff432ffa weekly release 4.0.1+ 2022-06-24 11:59:05 +08:00
Jun Pataleta 9c81a8e93f Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-06-24 11:59:04 +08:00
stevando 6dfe557c7e MDL-74981 mod_quiz: set limited width on overrides pages 2022-06-24 11:46:16 +08:00
stevando cb53c504d3 MDL-74981 mod_assign: set limited width on overrides pages 2022-06-24 11:46:16 +08:00
Juan Leyva 41445fa1bf MDL-75048 mod_quiz: Use new way to check if subcats are included 2022-06-23 10:02:33 +02:00
Jun Pataleta 0be775af96 Merge branch 'MDL-69939-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-23 09:53:37 +08:00
Jun Pataleta 979fd06b47 Merge branch 'MDL-74713-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-23 09:51:40 +08:00
Jun Pataleta 0198546f6e Merge branch 'MDL-73156-M400' of https://github.com/michael-milette/moodle into MOODLE_400_STABLE 2022-06-23 09:50:29 +08:00
Simey Lameze 12fc4c5e7a MDL-68867 calendar: remove dependency on USER->groupmember hack 2022-06-22 07:57:15 +08:00
Jun Pataleta 5b993c63c7 Merge branch 'MDL-73212_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-06-21 23:53:29 +08:00
Shamim Rezaie 5673f75524 MDL-75028 theme_boost: fix the inline edit tooltip for RTL 2022-06-22 01:18:59 +10:00
Eloy Lafuente (stronk7) efa7b639d0 MDL-73212 gha: Allow parameters to be passed via secret
We are disabling the -v (verbose) option, used by default. Still,
now we support a secret (that can be added to everyone's repository)
to accept any PHPUnit's command line options and run the tests with
them.

Some examples:

phpunit_options = -v (to keep the verbose option enabled)
phpunit_options = --testdox (to print information about every test...)

... (basically anything supported by the CLI)

Also, we are raising here the environment from Ubuntu 18.04 to 20.04

(self tested by GHA, heh)
2022-06-21 16:52:03 +02:00
Rodrigo Mady da Silva 948616f4a0 MDL-74826 tool_mobile: Add reportbuilder option in disabledfeatures 2022-06-21 11:29:50 -03:00
Jun Pataleta 221b7618a1 MDL-74812 gradingform_rubric: Add radiogroup role properly
Do not add the radiogroup role to the rubric criterion when the rubric
table is being displayed on edit or preview modes.
2022-06-21 12:28:18 +08:00
Jun Pataleta 5ceafdc943 MDL-74812 gradingform_rubric: Fix text overlap in rubric levels 2022-06-21 12:28:18 +08:00
Jun Pataleta 40e58f8e3a MDL-74812 gradingform_rubric: Do not use deprecated width attribute
Use inline CSS style to define level width instead.
2022-06-21 12:28:18 +08:00
Jun Pataleta 2b84963424 MDL-74812 mod_assign: Remove duplicate ID intro 2022-06-21 12:28:18 +08:00
Jun Pataleta f35f522991 MDL-74812 gradingform_rubric: Fix contrast issues in rubric table
* Darken the score value using the green theme colour
* Use a light green theme colour for selection backgrounds
* Unify rubric styles related to background and text colour within the
  criteria.
2022-06-21 12:28:18 +08:00
Jun Pataleta bd26046264 Merge branch 'MDL-74630-400' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-06-21 10:12:11 +08:00
AMOS bot e2de61b74b Automatically generated installer lang files 2022-06-21 00:09:42 +00:00
Jun Pataleta c2996f9301 Merge branch 'MDL-74715-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-20 21:57:28 +08:00
Daniil Fajnberg 9f26a1a312 MDL-73498 mod_lti: iframe allowed domain fixed 2022-06-20 15:52:29 +02:00
Paul Holden 2e7ca2f071 MDL-74715 reportbuilder: switch event for adding filters/conditions.
Switch the select element event listener to that provided by custom
events helper, for adding report filters and conditions. This improves
cross-platform support.
2022-06-20 09:09:06 +01:00
Jun Pataleta 4cd34267b6 Merge branch 'MDL-74358_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-06-20 14:36:05 +08:00
Ilya Tregubov f02b730069 Merge branch 'MDL-74694-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-17 15:07:48 +04:00
Paul Holden ceb4b0e0b4 MDL-69939 webservice: correct AJAX bool value in services definition. 2022-06-17 11:03:40 +01:00
Eloy Lafuente (stronk7) feb621d4de MDL-74358 availability: Avoid php8 problem with array_values(null) 2022-06-17 11:09:48 +02:00
Ilya Tregubov 490929b3ba Merge branch 'MDL-74296-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-06-17 12:55:02 +04:00
Angelia Dela Cruz d324358906 MDL-74861 behat: H5Pactivity behat generators use UI
Replace steps that manually add H5Pactivity instances via the UI
and use Behat generators. This improves the speed of the Behat test
runs.
2022-06-17 16:28:09 +08:00
Angelia Dela Cruz f8c9d93455 MDL-74861 behat: H5P behat generators use UI
Fixed H5P file upload error by adding root directory to detect
the file path and upload package file successfully.
2022-06-17 16:27:38 +08:00
Jun Pataleta 14d4bfdd2a weekly release 4.0.1+ 2022-06-17 15:30:30 +08:00
Eloy Lafuente (stronk7) 837e0cdce3 Merge branch 'MDL-72324-400-fix' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-17 08:38:45 +02:00
Jun Pataleta 211419a9c6 MDL-72324 core: Add upgrade.txt note about $plugin->incompatible 2022-06-17 10:37:59 +08:00
Jun Pataleta 92a2ccff5e Merge branch 'MDL-74529-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-17 10:19:12 +08:00
Jun Pataleta dce7206e8a Merge branch 'MDL-74533-400' of https://github.com/BruceGoodGuy/moodle into MOODLE_400_STABLE 2022-06-17 10:19:11 +08:00
Jun Pataleta 65cc1b695a Merge branch 'MDL-72555-400' of https://github.com/laurentdavid/moodle into MOODLE_400_STABLE 2022-06-17 10:19:11 +08:00
Simey Lameze b8602beb62 MDL-72292 core: add param type and polishing 2022-06-17 09:54:30 +08:00
Alexander Bias e8ef35b7c9 MDL-72292 core: Check if fulldir is set when loading renamed classes 2022-06-17 09:54:30 +08:00
Marina Glancy 9fb4b68799 MDL-74972 core_form: frozen autocomplete element does not display values 2022-06-16 10:25:00 +02:00
Paul Holden 8ed775e45f MDL-74287 forms: request changesmade string as required.
Unconditionally requesting the string was triggering exceptions
during installation, before the required external functions had
been populated.
2022-06-16 08:07:48 +01:00
Paul Holden fafa45112a MDL-74287 media_videojs: skip dynamic loader during install/upgrade. 2022-06-16 08:07:48 +01:00
Jake Dallimore 9b8ce4d82b MDL-74691 enrol_lti: add coverage of lti-ags claim variations to service
This test verifies how the service handles changes in the lti-ags claim
sent over several launches - ensuring the claim data is updated each
time.
2022-06-16 14:59:12 +08:00
Jake Dallimore 006b32290c MDL-74691 enrol_lti: allow omission of lineitems property in ags claim
The claim is valid with either or both of the URLs, so long as there's
at least one.
2022-06-16 14:59:05 +08:00
Jun Pataleta ba7c038739 MDL-74742 course: Use primary colour for Add button labels
Use the primary colour for the text inside the "Add a block" and
"Add an activity or resource" buttons.
2022-06-16 14:43:30 +08:00
Michael Milette 4b2efd494e MDL-73156 user: Custom user profile field names now filtered. 2022-06-15 11:45:45 -04:00
Jun Pataleta 8e58b0bace Merge branch 'MDL-74565-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-15 23:21:06 +08:00
Jun Pataleta 7bca8a175f Merge branch 'MDL-72324-incompatible-check-400' of https://github.com/Peterburnett/moodle into MOODLE_400_STABLE 2022-06-15 23:04:10 +08:00
Paul Holden 24d82b3e4a MDL-74694 reportbuilder: unit test coverage of external exporters. 2022-06-15 13:07:45 +01:00
Jun Pataleta eab32b304a Merge branch 'MDL-73966-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-15 18:06:15 +08:00
Jun Pataleta 86d0e4f7d7 Merge branch 'MDL-74871-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-15 17:17:07 +08:00
Bas Brands b9d50fc8fe MDL-74929 mod_assign: remove incorrect closing </div> 2022-06-15 09:11:34 +02:00
Paul Holden 8781ef341c MDL-74713 admin: format custom profile fields in identify config. 2022-06-14 17:19:36 +01:00
Jun Pataleta 4dfd7a290b Merge branch 'MDL-74790-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-14 22:53:44 +08:00
Jun Pataleta f3bfa720ad Merge branch 'MDL-74573_400' of https://github.com/aya-saad1/moodle into MOODLE_400_STABLE 2022-06-14 22:35:45 +08:00
Jun Pataleta 867cce4152 Merge branch 'MDL-74649-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-14 22:27:04 +08:00
Víctor Déniz 17bb38c307 Merge branch 'MDL-74526-400' of https://github.com/devlionco/moodle into MOODLE_400_STABLE 2022-06-14 10:11:37 +01:00
Víctor Déniz 47a4ef1e5e Merge branch 'MDL-74449_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-06-14 10:02:49 +01:00
Laurent David b8bf53eb4b MDL-72555 block_site_main_menu: Fix activity chooser issue
* When adding the block_site_main_menu on every page, the activity chooser generated
for this entire page is set with courseid = 1. So any activity is then added to the
home page instead of a course.
2022-06-14 10:04:17 +02:00
Jun Pataleta eab8c74464 Merge branch 'MDL-74816-400' of https://github.com/dpalou/moodle into MOODLE_400_STABLE 2022-06-14 14:03:37 +08:00
Jun Pataleta 2d9c3446e9 Merge branch 'MDL-74597-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-14 12:57:13 +08:00
Paul Holden 79651c7d22 MDL-74597 themes: remove pix icon references from custom menu items.
Support for them was removed in 8c336899, however existing config
remained that would lead to bogus URLs in custom user menu items.
2022-06-13 21:43:33 +01:00
Ilya Tregubov fb5e0c453b Merge branch 'MDL-74628-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-13 10:58:28 +04:00
Jake Dallimore 6228f13bdd Merge branch 'MDL_74310_400' of https://github.com/cengage/moodle into MOODLE_400_STABLE 2022-06-13 11:46:08 +08:00
Jake Dallimore 5bb2452ace Merge branch 'MDL69756_MOODLE_400_STABLE' of https://github.com/Amrita1991/moodle into MOODLE_400_STABLE 2022-06-13 11:12:37 +08:00
Jake Dallimore 8275662ed3 Merge branch 'MDL-74718-400' of https://github.com/sharidas/moodle into MOODLE_400_STABLE 2022-06-13 10:53:25 +08:00
Huong Nguyen f4eb5cb554 MDL-74632 atto_link: Fix cannot create a link for an image 2022-06-13 09:46:16 +07:00
Huong Nguyen f2fc73c674 MDL-74701 core: Fix popover elements are focusable even when hidden 2022-06-13 09:45:28 +07:00
Paul Holden 9fc49012bd MDL-74565 gradereport_grader: define capability required for editing. 2022-06-12 20:03:31 +01:00
Ilya Dymshits 86f4f6864d MDL-74526 theme: remove icon from empty categories in RTL languages 2022-06-12 10:41:54 +03:00
Eloy Lafuente (stronk7) ca8715654b MDL-74449 gradebook: Protect flatten_dependencies_array() a little bit
It has been detected that the flatten_dependencies_array() was fragile
and leading to wrong results when some incorrect data was passed to it.

This includes:

- Missing elements.
- Null dependencies.
- Non array dependencies.

While the existing behaviour (testing-wise) has been preserved, now the
situations above are better controlled and the function ignores all
those incorrect cases that shouldn't happen ever.

That implies that a good number of notices/warnings/errors aren't
happening anymore. That was impacting both results (when the problems
were  only notices and warnings) and execution (when the problems
were errors).

Covered with tests.
2022-06-10 18:17:56 +02:00
Laurent David d9a62c9fac MDL-74296 mod_bigbluebuttonbn: Fix completion indicator
* Completion view should work out of the box
* Patch the _user_outline and _user_complete so it works with completion view, while
implementing something better in MDL-74468
2022-06-10 18:05:07 +02:00
Sara Arjona 4a9fa426bc weekly release 4.0.1+ 2022-06-10 17:08:19 +02:00
Sara Arjona f1d4fd0db7 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-06-10 17:08:16 +02:00
Amrita 129d445908 MDL-69756 nextcloud: copy-overwrite handling 2022-06-10 16:35:05 +02:00
Amrita c6ad71859c MDL-74387 url: exception for php to correct icon 2022-06-10 16:07:25 +02:00
Jun Pataleta 2c58871a74 MDL-74802 core: Remove tooltip on the notification close button
Reverting the addition of a Boostrap tooltip on the alert notification's
close button. It introduced a bug where the tooltip remains after
dismissing the notification alert. We can manually toggle the state of
the tooltip via JS, but I don't think it's worth the effort. The tooltip
is meant as an added bonus for sighted users to see what the close
button is about.
2022-06-10 13:15:32 +02:00
Jun Pataleta 42d214d0cc MDL-74802 core_user: Use button label to close notification alert
With the notification alert's close button now properly labelled, it is
better for Behat to interact on it using its label.
2022-06-10 13:15:32 +02:00
Andrew Nicols fb4a9db65e MDL-73013 filelib: Fix code lint 2022-06-10 13:15:32 +02:00
Andrew Nicols f5e1074653 MDL-73013 filelib: Address coding style violations 2022-06-10 13:15:32 +02:00
Andrew Nicols 3ec081f2de Merge branch 'MDL-73013-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-10 13:15:32 +02:00
Jake Dallimore c374c271b1 Merge branch 'MDL-72377-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-10 13:15:32 +02:00
Andrew Nicols 09bdf8c905 Merge branch 'MDL-73466-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-10 13:15:32 +02:00
Andrew Nicols be3348d85e Merge branch 'MDL-74553-400' of https://github.com/marinaglancy/moodle into MOODLE_400_STABLE 2022-06-10 13:15:32 +02:00
Andrew Nicols cb9d48373b Merge branch 'MDL-74764-400' of https://github.com/BruceGoodGuy/moodle into MOODLE_400_STABLE 2022-06-10 13:15:31 +02:00
Víctor Déniz 98018a490f Merge branch 'MDL-69970_400' of https://github.com/aya-saad1/moodle into MOODLE_400_STABLE 2022-06-10 13:15:31 +02:00
Sara Arjona 1e1cd2fa6b Merge branch 'MDL-74802-400-2' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-10 13:15:31 +02:00
Sara Arjona 603486e1f7 Merge branch 'MDL-74577-400' of https://github.com/sharidas/moodle into MOODLE_400_STABLE 2022-06-10 13:15:31 +02:00
Angelia Dela Cruz 2409c05065 MDL-74841 behat: Label behat generators use UI
Replace steps that manually add Label instances via the UI and use
Behat generators. This improves the speed of Behat test runs.
2022-06-10 13:11:00 +08:00
Paul Holden df98fb57ee MDL-74649 course: render scale information using page popup layout. 2022-06-09 12:18:50 +01:00
Jake Dallimore 28e2f8bc2a MDL-74906 mod_lti: fix form selector in multi-item content item post
Use #region-main-box and not .mform in the selector, otherwise it may
return the wrong mform, such as global search, if enabled. This is the
same way the form is selected in showMultipleSummaryAndHideForm().
2022-06-09 16:53:32 +08:00
Paul Holden 2408bd007b MDL-74408 core: exclude empty patterns in divert email config. 2022-06-09 09:39:24 +01:00
Sujith Haridasan a22898e2af MDL-74718 webdav: correct the loop when reading chunks
Adjusted the condition while reading the streams
in chunks. Read till the end to make sure we have got all
the data. Else we might not get all the data to show
in file picker.
2022-06-09 12:03:38 +05:30
Paul Holden d29cdb623e MDL-73466 forumreport_summary: use formatted course module name. 2022-06-08 21:36:52 +01:00
Víctor Déniz eb4a12f1f0 Merge branch 'MDL-73774-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-06-08 10:15:16 +01:00
Víctor Déniz aee5fc1223 Merge branch 'MDL-74726-400' of https://github.com/ssj365/moodle into MOODLE_400_STABLE 2022-06-08 10:07:10 +01:00
Eric Merrill 26a8d1fd81 MDL-74182 core_task: Obey CFG debug settings 2022-06-08 10:42:17 +02:00
gthomas2 137cfc18ee MDL-74922 javascript: storragewrapper validateCache fix 2022-06-08 09:34:20 +01:00
Adam Olley 25212b83c3 MDL-74886 core_admin: Add unit test
Simple unit test to verify we don't get the TypeError anymore.
2022-06-08 10:08:10 +08:00
Simey Lameze c6cc60cb79 MDL-74886 core_admin: cast value and unit to integer 2022-06-08 10:08:10 +08:00
Peter Burnett eaf62826c3 MDL-72324 upgrade: Fix incompatible check in upgrade to match docs 2022-06-08 10:54:00 +10:00
AMOS bot 90f855220d Automatically generated installer lang files 2022-06-08 00:08:18 +00:00
Sara Arjona d0cedfa840 Merge branch 'MDL-74605-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-07 17:20:47 +02:00
Sara Arjona c4920eab6d Merge branch 'MDL-74678_400' of https://github.com/lostrogit/moodle into MOODLE_400_STABLE 2022-06-07 17:01:30 +02:00
Sara Arjona 48f59ff4e6 Merge branch 'MDL-74344-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-07 16:51:51 +02:00
Sara Arjona 264d4289da Merge branch 'MDL-74710-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-06-07 16:25:32 +02:00
Sara Arjona a91c937935 Merge branch 'MDL-72983-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-07 16:10:38 +02:00
Alexey b5f4e35746 MDL-74522 lib/classes/navigation fix Navbar My courses data-key value 2022-06-07 16:30:30 +03:00
Paul Holden 1201a5fad5 MDL-74628 forumreport_summary: remove left margin of filter popover. 2022-06-07 11:08:33 +01:00
Paul Holden 1d6529f5ea MDL-74529 theme_boost: accessible autolink styles from filters.
The `autolink` class is used by various filter types to create
hyperlinks within text. Extend existing `aalink` class so they
behave in the same way.
2022-06-07 10:57:57 +01:00
Huong Nguyen 6cce66dcf7 MDL-73774 timeline: Prevent ID duplication 2022-06-07 11:48:25 +07:00
Jun Pataleta ead2f17b57 Merge branch 'MDL-70223_400' of https://github.com/aya-saad1/moodle into MOODLE_400_STABLE 2022-06-07 10:29:43 +08:00
AMOS bot 99935628cf Automatically generated installer lang files 2022-06-07 00:08:13 +00:00
Paul Holden 825766216d MDL-74871 user: account for absense of identity fields during export. 2022-06-06 21:12:40 +01:00
Paul Holden e17c20a424 MDL-72983 tool_dataprivacy: respect capability to export own data. 2022-06-06 20:50:24 +01:00
Paul Holden 76f327d195 MDL-72377 grade: fix category form hidden/until fields.
Ensure the saved values for the hidden and hidden until fields are
populated when editing a grade category. Fix behaviour on enabling
the hidden until field.

Re-enable tests commented out in eba1d32c.
2022-06-06 15:28:26 +01:00
Paul Holden ffb62740c0 MDL-72377 grade: increase size of category hidden fields.
As well as storing 1/0 to indicate hidden state, they are also used
to store a timestamp indicating hidden until date. Increasing field
size allows these values to be stored without triggering exceptions.
2022-06-06 15:28:26 +01:00
Paul Holden 59c9a5f46b MDL-73121 atto_managefiles: match used files enclosed by quotes. 2022-06-06 15:17:23 +01:00
Ilya Tregubov 9009e1bd30 Merge branch 'MDL-74599-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-06 16:12:06 +06:00
Ilya Tregubov dfb3226883 Merge branch 'MDL-69951-remove_drop-font-tags-400' of https://github.com/leonstr/moodle into MOODLE_400_STABLE 2022-06-06 11:12:35 +06:00
aya.saad e84729de92 MDL-74573 mod_assign: convert view other attempt link to a button 2022-06-05 09:21:52 +02:00
aya.saad 7262d95895 MDL-70223 h5p: fix invalid id when adding h5p activity 2022-06-05 09:19:45 +02:00
aya.saad d4f34b0904 MDL-69970 icons: flip help icon direction in RTL languages 2022-06-05 09:17:57 +02:00
Shamim Rezaie 59bfaeda37 Merge branch 'MDL-74250-400' of https://github.com/adpe/moodle into MOODLE_400_STABLE 2022-06-03 18:42:33 +10:00
Andrew Nicols 887e106a6c Merge branch 'MDL-73898-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-03 13:31:14 +08:00
Shamim Rezaie be06a75a36 Merge branch 'MDL-74699-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-06-03 14:45:11 +10:00
Andrew Nicols ac39bac81b weekly release 4.0.1+ 2022-06-03 11:04:01 +08:00
Andrew Nicols 8a5e048594 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-06-03 11:03:58 +08:00
AMOS bot f91db6c35e Automatically generated installer lang files 2022-06-03 00:08:10 +00:00
Jun Pataleta 66a3d9edba Merge branch 'MDL-74631-invalid-tag-400' of https://github.com/leonstr/moodle into MOODLE_400_STABLE 2022-06-02 12:20:27 +08:00
Jun Pataleta f843322982 Merge branch 'MDL-57065-400' of https://github.com/ferranrecio/moodle into MOODLE_400_STABLE 2022-06-02 12:03:18 +08:00
Jun Pataleta 17e1d23c3f Merge branch 'MDL-71301-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-02 11:23:15 +08:00
Issam Taboubi fd2c90c29a MDL-71301 qtype_gapselect: Make blank answer box labels more meaningful 2022-06-02 10:51:33 +08:00
Jun Pataleta d2a6a5b164 Merge branch 'MDL-67966-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-06-02 10:29:56 +08:00
Joshua Ebarvia 7a5dabe6aa MDL-67966 mod_workshop: Use condition to verify form is using editor
This adds a condition to check if Online text is used
for the submission. The functions file_postupdate_standard_editor
and file_postupdate_standard_filemanager needs the property
content_editor of the formdata.
2022-06-02 10:28:33 +08:00
Sara Arjona de6d21497d Merge branch 'MDL-71276-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-06-01 18:37:52 +02:00
Sara Arjona 0921c43e2c Merge branch 'MDL-74752_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-06-01 17:05:18 +02:00
Tim Hunt 38db48744d MDL-74752 qtype_match: fix regrading logic - take 2 2022-06-01 14:24:30 +01:00
Noel De Martin 582f1bc1fe MDL-74613 grade: Add missing generators 2022-05-31 18:11:50 +02:00
Sara Arjona c496c5b819 Merge branch 'MDL-74752_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-05-31 17:39:12 +02:00
Tim Hunt 9d40a13eb6 MDL-74752 qtype_multianswer: implement regrading hooks 2022-05-31 09:22:51 +01:00
Tim Hunt 5990158a6f MDL-74752 qtypes gapselect & ddwtos: implement regrading hooks 2022-05-31 09:22:51 +01:00
Tim Hunt cc262124db MDL-74752 qtype_match: implement regrading hooks
As much as they can be before MDL-5560 is addressed.
2022-05-31 09:22:51 +01:00
Tim Hunt 5ad18a4070 MDL-74752 qtype_multichoice: fix regrading logic
The implements the new regrade-related hooks, and also has
tests for the changes to the core system, now that we have a question
type we can use for them.
2022-05-31 09:22:50 +01:00
Tim Hunt ca4ac3e8b6 MDL-74752 question regrading: implement the required hooks
This commit implements the necessary core hooks to ensure we only
allow a regrade of a quetion attempt to take place if the new and old
versions of the question are sufficiently similar.

It will be followed by commits to each question type where the
new method needs to be implemented.

Automated tests will be included in the first of those (mulitple choice)
becuse we need a question type that implements the hooks to test
the core changes.
2022-05-31 09:22:50 +01:00
Amaia Anabitarte c06e1de52d MDL-74630 core_contenbank: Add contextid to URL parameters 2022-05-31 09:48:45 +02:00
AMOS bot daf1199956 Automatically generated installer lang files 2022-05-31 00:08:11 +00:00
AMOS bot 5451d79a8c Automatically generated installer lang files 2022-05-30 00:08:06 +00:00
AMOS bot 763a4a3dac Automatically generated installer lang files 2022-05-28 00:08:15 +00:00
Jun Pataleta c9b5f15fb3 MDL-72885 output: Add lang attribute for language menu items 2022-05-27 23:39:56 +08:00
Jun Pataleta 88667463ac MDL-72885 output: Add lang attribute for language custom menu items 2022-05-27 19:42:21 +08:00
Jun Pataleta af1936faf4 MDL-72885 output: Allow additional attributes for custom menu items
* Plus don't render the link title if it's the same as the link text.
2022-05-27 19:42:21 +08:00
Leon Stringer 2ea21b9ccf MDL-73215 assign: Undefined var: plagiarismlinks
Fix: $plagiarismlinks is concatenated in return but may not have been
initialised.
2022-05-27 08:55:45 +01:00
Adrian Perez 275c174cbf MDL-74250 core: Improve indicator that link opens in new window 2022-05-27 07:21:51 +02:00
Khoa Nguyen Dang 04757718b1 MDL-74764 core_course: Activity is not in alphabetical order. 2022-05-27 10:23:03 +07:00
Jake Dallimore b81a2f80f7 weekly release 4.0.1+ 2022-05-27 10:02:09 +08:00
Claude Vervoort 86cd6040f1 MDL-74310 mod_lti: fix ltilinkid on lineitems import 2022-05-26 10:34:48 -04:00
Noel De Martin c5ce22a2e6 MDL-74220 data: Implement behat generators 2022-05-26 10:38:37 +02:00
Jake Dallimore c18cf220a2 Merge branch 'MDL-73801-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-26 12:11:52 +08:00
Jake Dallimore 6bd67f0a5f Merge branch 'MDL-73386-400' of https://github.com/junpataleta/moodle into MOODLE_400_STABLE 2022-05-26 11:47:27 +08:00
Dani Palou 8beef3f70b MDL-74816 mod_resource: Allow specify default file name in generator 2022-05-25 10:41:30 +02:00
Paul Holden b4c081fa08 MDL-74790 mod_resource: better detection of empty module intro. 2022-05-24 21:18:57 +01:00
Angelia Dela Cruz 7ee27356af MDL-74744 behat: Quiz behat generators use UI
Replace steps that manually add Quiz instances via the UI and use
Behat generators. This improves the speed of Behat test runs.
2022-05-24 10:53:02 +08:00
hieuvu 1ecfc86f97 MDL-74533 core_completion: Update using new grade pass for completion 2022-05-23 15:15:36 +07:00
Jun Pataleta 252dbc9605 MDL-74802 core: Improve the accessibility of alert notifications
* Make the ordering of the message and the close button logical on
  the DOM.
* Hide the times HTML entity
* Add sr-only label on the close button for non-sighted users
* Add tooltip on the close button sighted users
2022-05-23 13:00:22 +08:00
Daniel Ziegenberg 9b9823a56a MDL-74835 ci: Update nodejs version in travis integration to lts/gallium
In MDL-73915 the nodejs version was switched to lts/gallium but the
travis integration was not updated.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
2022-05-22 23:49:04 +02:00
Jun Pataleta 77134d5bb4 MDL-73386 mod_quiz: Use plain text for quiz navigation fake block title
* No need to enclose the title of the quiz navigation fake block in
a span tag. The block title also gets appended to the skip link which
means that a block title with a span tag assigned with an identifier
can cause duplicate ID errors on the DOM.
2022-05-21 00:33:32 +08:00
Ilya Tregubov e9aa483add Merge branch 'MDL-73225-400' of https://github.com/call-learning/moodle into MOODLE_400_STABLE 2022-05-20 18:00:04 +06:00
Laurent David 95742edc54 MDL-73225 mod_bigbluebuttonbn: Improve error message when joining
Display more friendly messages when:
    * When displaying activity and the server is not available
    * When we join a meeting and the server is not available or an error is detected
2022-05-20 13:06:27 +02:00
Sujith Haridasan f3150d4a26 MDL-74577 core: Reset login_failed_count_since_success after login
When the user is logged in successfully then reset the value
of login_failed_count_since_success to zero, if the value of
login_failed_count_since_success is greater than zero.
2022-05-20 10:14:40 +05:30
Ilya Tregubov d237a6312f weekly release 4.0.1+ 2022-05-19 19:24:28 +06:00
Ilya Tregubov c36a037c20 Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-05-19 19:24:27 +06:00
Paul Holden 3373632225 MDL-73801 backup: set predictably ordered backup next start time.
Prior to this change, the testcase would assert ordering based on
identical fields which could lead to random failures. Set distinct
next start time of course backup, and also remove random ordering
by sorting on defined course order (all other fields being equal).
2022-05-19 08:19:19 +01:00
Jun Pataleta c885df9202 Merge branch 'MDL-73163-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-05-19 10:11:15 +08:00
Jun Pataleta 1818370854 Merge branch 'MDL-74416-400' of https://github.com/lameze/moodle into MOODLE_400_STABLE 2022-05-19 09:59:45 +08:00
Jun Pataleta 8ff3de4299 Merge branch 'MDL-74377-400' of https://github.com/roland04/moodle into MOODLE_400_STABLE 2022-05-18 21:47:46 +08:00
Mikel Martín 86899b14cb MDL-74377 reportbuilder: Fix dimmed text for dropdown items
To show inactive/unavailable rows '.dimmed_text' class usages have been replaced with '.text-muted'.
2022-05-18 15:43:44 +02:00
Sara Arjona b259811d7a MDL-74784 core_badges: Fix exception with related badges
System badges with related badges were displaying an error before this patch,
because the is_guest($context) function expects a context_course.
2022-05-18 09:16:08 +02:00
Paul Holden 7edd6995e5 MDL-73966 grade: fetch required user name fields of unenrolled users. 2022-05-17 16:03:06 +01:00
AMOS bot 35f7c54107 Automatically generated installer lang files 2022-05-17 00:07:40 +00:00
Paul Holden 70d17adc0a MDL-71276 message_email: include alternate email in privacy export. 2022-05-16 09:42:23 +01:00
Carlos Castillo c05e07923f MDL-74678 reportbuilder: Allow null in category description callback
Since category description is a nullable column, we need to allow null
value in category description column callback in category entity
2022-05-13 08:09:23 -05:00
Paul Holden f81b1125f5 MDL-74344 comment: consistent capability check for accessing report.
Co-authored-by: David Wipperfurth <dwipperfurth@webcourseworks.com>
2022-05-13 10:32:03 +01:00
AMOS bot 454ec455bf Automatically generated installer lang files 2022-05-13 00:07:40 +00:00
Paul Holden 5a1f0fd327 MDL-73013 calendar: fix serving of files added to category events. 2022-05-12 16:13:03 +01:00
Jun Pataleta 0a3eedbebf weekly release 4.0.1+ 2022-05-12 22:16:04 +08:00
Leon Stringer 02bc67f6c5 MDL-69951 filter_tidy: Replace drop-font-tags
The option drop-font-tags was removed in HTML Tidy version 5.5.14.  It
had been deprecated since 5.1.25, the docs said "Use the clean option
instead" which is what this commit does (see
https://api.html-tidy.org/tidy/quickref_5.1.25.html#drop-font-tags).
2022-05-12 11:44:29 +01:00
Jun Pataleta 7d4c2fb5f2 Merge branch 'MDL-74413_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-05-12 12:08:55 +08:00
Jun Pataleta f0066123a3 Merge branch 'MDL-73971_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-05-12 11:54:38 +08:00
Kordan b65077c4c0 MDL-73163 behat: Changed most to must 2022-05-12 10:11:36 +08:00
Petr Skoda d58770969c MDL-74416 phpunit: fix generator counters reset 2022-05-12 10:10:11 +08:00
Jake Dallimore f7922dbe1d MDL-74699 enrol_lti: fix clientid retrieval from aud during launches 2022-05-12 09:20:35 +08:00
Marina Glancy 53f6f1ce05 MDL-74553 blocks: do not refer to form fields by id
This is not compatible with the dynamic forms and random ids
2022-05-11 16:23:35 +02:00
Shamiso.Jaravaza b4829f2475 MDL-74726 mod_bigbluebuttonbn: Fix muteonstart
Added missing muteonstart_editable in mod_form  block condition
2022-05-11 08:11:54 -06:00
Paul Holden e8f9288606 MDL-73898 user: exclude guest user from participants table. 2022-05-10 17:22:54 +01:00
Ilya Tregubov 72bdc3766e MDL-74710 mod_bigbluebuttonbn: Fix settings url. 2022-05-10 11:17:36 +06:00
Eloy Lafuente (stronk7) d8ea630f24 MDL-74413 phpunit: Move more tests to use correct names and namespaces
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.

Special mention to:

- Moved to the level2 "privacy" namespace:
  - \mod_assign\privacy\feedback_legacy_polyfill_test
  - \mod_assign\privacy\submission_legacy_polyfill_test

- Moved to the level2 "task" namespace:
  - \core_message\task\migrate_message_data_test
  - \ltiservice_gradebookservices\task\cleanup_test
  - \message_email\task\send_email_test
  - \mod_lti\task\clean_access_tokens_test
  - \mod_workshop\task\cron_task_test

- Moved to the level2 "event" namespace:
  - \core_h5p\event\deleted_test
  - \core_h5p\event\viewed_test

- Renamed to a better name:
  - backup_forum_activity_task_test.php (missing "task")
2022-05-07 20:33:10 +02:00
Jun Pataleta ac9e395ed6 Moodle release 4.0.1 2022-05-07 19:34:54 +08:00
Eloy Lafuente (stronk7) 8bdba9bdca MDL-73971 phpunit: Move more tests to use correct names and namespaces
Applied the following changes to various testcase classes:

- Namespaced with component[\level2-API]
- Moved to level2-API subdirectory when required.
- Fixed incorrect use statements with leading backslash.
- Remove file phpdoc block
- Remove MOODLE_INTERNAL if not needed.
- Changed code to point to global scope when needed.
- Fix some relative paths and comments here and there.
- All them passing individually.
- Complete runs passing too.

Special mention to:

- Some fixtures, initially defined in the test files have been
  moved to new files in fixtures subdirectory, leaving the unit
  test files clearer:
  - moodle2_course_format_test.php
- Rename wrong named test:
  - baseoptiogroup_test = baseoptigroup_test
2022-05-06 18:29:16 +02:00
Eloy Lafuente (stronk7) 99fc164199 weekly release 4.0+ 2022-05-06 15:58:28 +02:00
Ferran Recio 64a7e06f61 MDL-57065 theme_boost: fix debug messages
The first debug message is covered by the top navbar header. This patch
will move the body's first debug message down below the navbar.
2022-05-06 12:26:40 +02:00
Jake Dallimore 9ec2c12f3d MDL-74602 mod_assign: fix js error with assign grader on classic 2022-05-06 16:48:29 +08:00
Jun Pataleta 6ec89f6374 Merge branch 'MDL-74584-400-v1' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-05-06 14:17:37 +08:00
Mihail Geshoski 834c80849c MDL-74584 mod_bigbluebuttonbn: Update behat tests 2022-05-06 13:32:14 +08:00
Mihail Geshoski 674198a799 MDL-74584 mod_bigbluebuttonbn: Update unit tests 2022-05-06 13:32:14 +08:00
Mihail Geshoski 66c32a3687 MDL-74584 course: New optional parameter in get_module_types_names()
Adds new parameter in get_module_types_names() to optionally reset
the $modnames static cache.
2022-05-06 13:32:13 +08:00
Mihail Geshoski 0118227509 MDL-74584 mod_bigbluebuttonbn: Add install script and new upgrade step
Adds a new install script for the BBB module and a new upgrade step.
The BBB module now will be disabled by default for new installations
and also it will be disabled for the existing sites that use the
default BBB server configuration. Admistrators will be required to
confirm the acceptance of the related DPA prior to (re)enabling the
plugin once again.
2022-05-06 12:19:56 +08:00
Mihail Geshoski 2e1478b094 MDL-74584 mod_bigbluebuttonbn: Add DPA info in the general setting page
Adds a note in the BBB general settings page to raise awareness about
the legal obligations related to the data processing agreement with the
service provider which is currently configured.
2022-05-06 12:19:56 +08:00
Mihail Geshoski 6961258bc2 MDL-74584 mod_bigbluebuttonbn: Implement 'pre_enable_plugin_actions'
Implements a function for the 'pre_enable_plugin_actions' callback.
When the default BBB server settings are used while the administrator
attempts to enable the BBB plugin, the function will prevent this
action and trigger a dynamic form requesting the admin to conifrm
their acceptance of the related data processing agreement. The process
of enabling the plugin will continue as usual in cases where the
admin has already confirmed the acceptance of the dpa or a different
BBB server configuration is used other than the default.
2022-05-06 12:19:56 +08:00
Mihail Geshoski b4f6816952 MDL-74584 admin: Add callback executed prior to enabling a module
Adds a callback xxx_pre_enable_plugin_actions in admin/modules.php
which plugins can use to force additional actions before enabling the
plugin. The return value (bool) from the plugin callback method
specifies whether the process of enabling the plugin should continue
after the added actions or not.
2022-05-06 12:19:56 +08:00
Andrew Nicols 16b30d920b MDL-74511 core: Add phpcs default config 2022-05-06 12:01:32 +08:00
Ilya Tregubov 61d140e99f Merge branch 'MDL-41498-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-05-06 08:26:59 +06:00
Robert Schrenk cc5eb38cea MDL-41498 course: courses participant page 2022-05-06 08:26:08 +06:00
Víctor Déniz 3b7bba9e75 Merge branch 'MDL-74612-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-05 13:25:37 +01:00
Víctor Déniz 2e020b506a Merge branch 'MDL-74128-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-05 12:09:59 +01:00
Víctor Déniz 74cdb7c4c8 Merge branch 'MDL-74567-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-05 09:39:39 +01:00
Paul Holden ef8d381a2f MDL-74567 core: re-factor flickr libraries to use shared user-agent. 2022-05-05 09:21:22 +01:00
Jun Pataleta 39717b72b1 MDL-74317 blocks: Revert checking of block usage against page format 2022-05-05 10:04:01 +08:00
Jun Pataleta e7ff99758e Merge branch 'MDL-74576-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-05-05 09:55:45 +08:00
Jun Pataleta 26492d4979 Merge branch 'MDL-73981-400' of https://github.com/ilyatregubov/moodle into MOODLE_400_STABLE 2022-05-05 09:49:06 +08:00
Ilya Tregubov 3abbcd9976 Merge branch 'MDL-74602-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-05-05 07:46:55 +06:00
Jun Pataleta 1456551ba6 Merge branch 'MDL-74546-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-05-05 09:41:34 +08:00
Ilya Tregubov c1ebec7cbc MDL-73981 tool_uploadcourse: Validate enrolment role from csv. 2022-05-05 07:39:50 +06:00
Jun Pataleta 812c8b37e5 Merge branch 'MDL-74511-400' of https://github.com/andrewnicols/moodle into MOODLE_400_STABLE 2022-05-05 09:37:31 +08:00
Paul Holden 8b2b7f97ee MDL-74599 reportbuilder: use context of current report when present. 2022-05-04 14:30:11 +01:00
Jake Dallimore f2ab11aa5b MDL-73736 core_auth: Fix concurrency issue in login_attempt_failed()
This patch wraps the login_failed_count logic in a resource lock and
forces a user preferences cache reload. Each thread must wait for the
lock and must fetch the current count before incrementing it. This
ensures that login_failed_count is correct across threads and that the
lockout threshold is correctly honoured.

Co-Authored-By: Sujith Haridasan <sujith@moodle.com>
2022-05-04 14:45:00 +06:00
Michael Hawkins 240b402523 MDL-74333 badges: Check profile criteria valid when reviewing 2022-05-04 12:58:02 +08:00
Ilya Tregubov 34c4b3ce0c Merge branch 'MDL-74563-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-04 09:26:06 +06:00
Ferran Recio 8b098b4a4e MDL-71623 core_search: fix user document visibility 2022-05-04 03:55:18 +02:00
Amaia Anabitarte 38a40c5e4b MDL-74318 core_user: Description field as hidden on profile 2022-05-04 03:55:18 +02:00
Paul Holden 72580a5413 MDL-74204 mod_assign: escape identity fields in allocate marker form. 2022-05-04 03:55:18 +02:00
Jun Pataleta 6253ab0170 Merge branch 'MDL-73878-40' of https://github.com/aanabit/moodle into MOODLE_400_STABLE 2022-05-04 09:44:28 +08:00
Leon Stringer d25f2eeee6 MDL-74631 mod_lti: Remove </img>
Remove illegal HTML tag.

Added example context to pass CI checks.
2022-05-03 17:29:38 +01:00
Amaia Anabitarte ff89abc311 MDL-73878 core_user: Creating a new category for social fields 2022-05-03 17:46:18 +02:00
Amaia Anabitarte 7878d79359 MDL-73878 core_user: Fixing social fields upgrading issue 2022-05-03 17:43:22 +02:00
Jun Pataleta 93319747b2 Merge branch 'MDL-74543_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-05-03 22:22:45 +08:00
Tim Hunt f46c1b4fa9 MDL-74543 quiz attemptlib: covert string comparison to ===
Where obviously safe.
2022-05-03 13:48:04 +01:00
Tim Hunt a0297df86e MDL-74543 quiz: correctly record time when overdue attempt submitted 2022-05-03 13:48:04 +01:00
Víctor Déniz da9ab8a2f9 Merge branch 'MDL-74611_400' of https://github.com/timhunt/moodle into MOODLE_400_STABLE 2022-05-03 13:00:59 +01:00
Ilya Tregubov 33829b8b68 Merge branch 'mdl65478-fix-400' of https://github.com/matthewhilton/moodle into MOODLE_400_STABLE 2022-05-03 15:43:59 +06:00
Tim Hunt f5f468f6e1 MDL-74611 course settigns: re-order Common module settings
All the group-related settings should be next to each other.
2022-05-03 10:36:01 +01:00
Jake Dallimore 6b4f55c91b Merge branch 'MDL-74441-400' of https://github.com/cameron1729/moodle into MOODLE_400_STABLE 2022-05-03 16:54:50 +08:00
Cameron Ball 63ed56bc7c MDL-74441 mod_forum: Fix overflow in unified grader 2022-05-03 15:52:26 +08:00
Ilya Tregubov 841214dab2 Merge branch 'MDL-74598-400' of https://github.com/roland04/moodle into MOODLE_400_STABLE 2022-05-03 11:57:07 +06:00
Jason den Dulk 43cbc05a2d MDL-65478 backup, course format: Handle editor elements in course format
Modified course format options reading and writing to be able to handle Editor elements by enabling them to split array values into
multiple values before inserting into database, and combining multiple values into an array when reading from the database.
Modified backup and restore code to use backup_nested_elements, and to interact directly with the database.

Co-authored-by: Jason den Dulk <jasondendulk@catalyst-au.net>
Co-authored-by: Matthew Hilton <matthewhilton@catalyst-au.net>
2022-05-03 14:23:15 +10:00
Ilya Tregubov 973ea46697 Merge branch 'MDL-74450-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-05-03 09:52:26 +06:00
Jake Dallimore 98dbb93589 MDL-74602 mod_wiki: disable activity header in wiki print view 2022-05-03 11:09:00 +08:00
Jake Dallimore 5fa19e43b3 MDL-74602 mod_chat: disable activity header in ajax chat interface 2022-05-03 11:09:00 +08:00
Jake Dallimore 0d3a2c9181 MDL-74602 mod_book: disable activity header on book print page 2022-05-03 11:09:00 +08:00
Jake Dallimore 4f7bd72f72 MDL-74602 mod_assign: disable activity header on embedded grader page 2022-05-03 11:09:00 +08:00
Jake Dallimore cc182408aa MDL-74602 theme_boost: fix missing activity header in embedded layout
The activity header, which includes things like dates and completion
information, was moved out of the page $OUTPUT and into a separate
template context variable in 4.0, meaning it was missing from any layout
which didn't actively add it back to the page output. This fixes this
problem for the embedded layout only by adding support for the activity
header in the embedded template.
2022-05-03 11:09:00 +08:00
Jun Pataleta 8b3913605a Merge branch 'MDL-74317-400' of https://github.com/dravek/moodle into MOODLE_400_STABLE 2022-05-02 17:24:23 +08:00
Jun Pataleta 8ff67c91de Merge branch 'MDL-74436-400' of https://github.com/paulholden/moodle into MOODLE_400_STABLE 2022-05-02 16:30:06 +08:00
Jake Dallimore 4cbd6a0c6a MDL-74576 enrol_lti: allow unsupported scopes in ags_info
Instead of hard blocking launches with extension scopes, just ignore
the unsupported scopes and continue.
2022-05-02 15:39:20 +08:00
Paul Holden 203a55f57a MDL-74128 reportbuilder: Behat helper for navigating to view page. 2022-04-29 17:18:06 +01:00
Paul Holden 5b05a9378c MDL-74612 cohort: use data generator for populating cohort members. 2022-04-29 16:23:32 +01:00
Paul Holden b51257df71 MDL-74605 media_videojs: move player options to data setup.
Fixes the `playbackRates` functionality that was lost in library
upgrade (9ea8fa37).
2022-04-29 12:15:30 +01:00
Ilya Tregubov 81e5d425c4 weekly release 4.0+ 2022-04-29 07:55:31 +06:00
Ilya Tregubov 6362d7b51c Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE 2022-04-29 07:55:27 +06:00
Mikel Martín 51d3df8d30 MDL-74598 reportbuilder: Fix action menus alignment to the right 2022-04-28 16:46:00 +02:00
Paul Holden a60a6d41a3 MDL-74567 repository_flickr: replace user-agent value for API calls.
Flickr doesn't like user agent that looks like a bot. Effectively the
same reasoning/fix as b8ee31a0.
2022-04-28 14:45:37 +01:00
Mihail Geshoski d6ba7724ae MDL-74450 admin: Use the context from admin_settingpage as page context
The defined context in admin_settingpage does not always relate to the
system context. One example is the 'frontpagesettings' admin setting
page which specifies front page as it's default context. Therefore, the
page context in admin/settings.php should be consisent with the defined
context in the related admin_settingpage object to make sure that the
expected navigation menus are being displayed and properly highlighted.
Additionally, the code in admin/settings.php related to the breadcrumb
structure specific to 'frontpagesettings' has been removed as it is no
longer relevant.
2022-04-28 13:23:57 +08:00
Jun Pataleta 4f1be71581 Merge branch 'MDL-74478-400' of https://github.com/mihailges/moodle into MOODLE_400_STABLE 2022-04-28 12:54:26 +08:00
Peter Dias 58ddfe84c2 MDL-74478 badges: Check completion_fail when awarding badge
Bring the award_criteria_activity checks in line with the observer checks
2022-04-28 12:16:19 +08:00
Jun Pataleta dd156a4160 Merge branch 'MDL-74461-400' of https://github.com/HuongNV13/moodle into MOODLE_400_STABLE 2022-04-28 11:39:59 +08:00
Huong Nguyen 3bc8fa20bf MDL-74461 Navigation: Add section anchor to activity breadcrumb 2022-04-28 10:05:17 +07:00
Ilya Tregubov 954ae33aa9 Merge branch 'MOODLE_400-MDL-74427-v4' of https://github.com/golenkovm/moodle into MOODLE_400_STABLE 2022-04-28 08:10:29 +06:00
Jun Pataleta 24dbcc0008 Merge branch 'MDL-74537-400-enfix' of https://github.com/vmdef/moodle into MOODLE_400_STABLE 2022-04-27 15:47:30 +06:00
Ilya Tregubov ebb96c2850 Merge branch 'MDL-74510_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-04-27 15:47:30 +06:00
Paul Holden 870c5ffbde MDL-74479 reportbuilder: account for custom field context in output. 2022-04-27 15:47:29 +06:00
Eloy Lafuente (stronk7) 049e27a805 MDL-74320 lesson: Remove tested elsewhere parts of the scenario
The scenario has not only grades related completion conditions
but also timing conditions or reach the end conditions that
shouldn't be tested by a grades feature.

More yet, those completion conditions are already tested by
other feature files, namely:
- reach the end: completion_condition_end_reached.feature
- visit and timing: lesson_activity_completion.feature

So we have removed all those parts that are being tested
by other features.

Specially the visit and timing ones, because they lead to
random failures in slow environments and they have been
fixed in the lesson_activity_completion.feature scenarios
by MDL-72698.
2022-04-27 15:47:29 +06:00
Laurent David 6c7fa91d59 MDL-74514 mod_bigbluebuttonbn: BBB server is polled too often
* Fix issue with the roomupdater that should not force the updatecache flag
for get_meeting_info API
* Fix issue when meeting is not started (and does not exist) and bigbluebutton_proxy::get_meeting_info
throws an exception, skipping the cache and then polling the server every second.
2022-04-27 15:47:29 +06:00
Claude Vervoort 7c84b92be3 MDL-74481 mod_lti: fix role lookup for LTI 1.3 2022-04-27 15:47:29 +06:00
Mikhail Golenkov bb36c3a1bb MDL-74427 question: Re-use get_real_question_ids_in_category() 2022-04-27 12:35:08 +10:00
Mikhail Golenkov 990bfee024 MDL-74427 question: Implement get_real_question_ids_in_category() 2022-04-27 12:34:55 +10:00
David Matamoros 17584f9c92 MDL-74317 blocks: Blocks can be added to profile pages
- Fixed method user_can_addto to take into account that
blocks can also be added to user profile pages
2022-04-26 14:34:45 +02:00
David Matamoros f551072f9e MDL-74317 output: Remove capability checks in edit mode WS
- Removed validation on the change edit mode WS. Permission should
be handled where the edit button is rendered in order to show or not
the button.
2022-04-26 14:33:34 +02:00
Helen Foster 3447ab640c MDL-74537 lang: Import fixed English strings (en_fix) 2022-04-26 11:24:27 +01:00
Paul Holden 3dbad11471 MDL-74563 reportbuilder: cast operator parameter in number filter.
Add missing form labels, too.
2022-04-25 21:44:48 +01:00
Paul Holden 43b4b87fbf MDL-74436 calendar: validate course/category field during import. 2022-04-25 18:02:00 +01:00
Paul Holden 7d33385a1d MDL-74477 reportbuilder: sortable custom user profile field columns. 2022-04-25 13:40:12 +06:00
AMOS bot 657617ac21 Automatically generated installer lang files 2022-04-23 00:07:39 +00:00
Eloy Lafuente (stronk7) 205e4152cc MDL-74510 upgrade: add the 4.0.0 separation line to all upgrade scripts 2022-04-22 18:45:16 +02:00
Eloy Lafuente (stronk7) e36fb751e5 weekly release 4.0+ 2022-04-22 18:03:47 +02:00
Jake Dallimore a0c1acd7fd MDL-74546 enrol_lti: add missing d-flex to table to fix safari layout 2022-04-22 10:19:08 +08:00
Ilya Tregubov 2184ea5b64 Merge branch 'MDL-74394_400' of https://github.com/aolley/moodle into MOODLE_400_STABLE 2022-04-22 08:01:09 +06:00
Víctor Déniz c81b3dc384 Merge branch 'MDL-74312-400' of https://github.com/snake/moodle into MOODLE_400_STABLE 2022-04-21 16:39:51 +01:00
Adam Olley ca6a4b1953 MDL-74394 mnet: Better check for openssl_get_publickey() failure
In PHP8, this func now returns an object of type OpenSSLAsymmetricKey, not a
resource.

Reference:
https://www.php.net/manual/en/function.openssl-pkey-get-public.php
2022-04-21 22:08:20 +09:30
Jake Dallimore 20cefd70e2 MDL-74312 enrol_lti: fix copytoclipboard trigger element
This should be a button given it's an action, and making it a button
means it can be activated using either the space or enter keys, instead
of just enter.
2022-04-20 09:49:35 +08:00
Sara Arjona bc87d55a1f Merge branch 'MDL-74512_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE 2022-04-19 12:55:29 +02:00
Andrew Nicols 51c376cfca MDL-74511 core: Add phpcs config generator 2022-04-19 11:15:27 +08:00
Eloy Lafuente (stronk7) e0034b0566 MDL-74512 behat: Skip tests requiring lang install/upgrade
By adding the step:

Given remote langimport tests are enabled

We make the execution of scenarios requiring to install /
upgrade lang packs optional, based in the existence of the constant:

TOOL_LANGIMPORT_REMOTE_TESTS

That way, when we are skipping language upgrades with the CFG var:

$CFG->skiplangupgrade = true

We can decide not not execute those tests.

With other words, putting something like this in the config.php
file we will be controlling when to execute or no the behat tests:

    // Disable lang updates on upgrade.
    $CFG->skiplangupgrade = true;
    if (empty($CFG->skiplangupgrade)) {
        // Define it only if we aren't skipping lang upgrades.
        define('TOOL_LANGIMPORT_REMOTE_TESTS', true);
    }
2022-04-17 20:35:02 +02:00
2468 changed files with 27205 additions and 15431 deletions
+9 -8
View File
@@ -13,14 +13,14 @@ env:
jobs:
Grunt:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- name: Checking out code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Configuring node & npm
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
@@ -54,11 +54,11 @@ jobs:
fail-fast: false
matrix:
include:
- os: ubuntu-18.04
- os: ubuntu-22.04
php: 7.3
extensions:
db: mysqli
- os: ubuntu-18.04
- os: ubuntu-22.04
php: 8.0
db: pgsql
extensions: xmlrpc-beta
@@ -85,7 +85,7 @@ jobs:
postgresql password: test
- name: Configuring git vars
uses: rlespinasse/github-slug-action@v3.x
uses: rlespinasse/github-slug-action@v4
- name: Setting up PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
@@ -96,7 +96,7 @@ jobs:
coverage: none
- name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setting up PHPUnit
env:
@@ -111,4 +111,5 @@ jobs:
- name: Running PHPUnit tests
env:
dbtype: ${{ matrix.db }}
run: vendor/bin/phpunit -v
phpunit_options: ${{ secrets.phpunit_options }}
run: vendor/bin/phpunit $phpunit_options
+2
View File
@@ -54,3 +54,5 @@ moodle-plugin-ci.phar
/admin/tool/componentlibrary/docs
/admin/tool/componentlibrary/hugo/site/data/my-index.json
.hugo_build.lock
.phpcs.xml
jsconfig.json
+1
View File
@@ -233,6 +233,7 @@ const getOwningComponentDirectory = checkPath => {
};
module.exports = {
fetchComponentData,
getAmdSrcGlobList,
getComponentFromPath,
getComponentPaths,
+39
View File
@@ -21,6 +21,43 @@
*/
module.exports = grunt => {
/**
* Generate the PHPCS configuration.
*
* @param {Object} thirdPartyPaths
*/
const phpcsIgnore = (thirdPartyPaths) => {
const {toXML} = require('jstoxml');
const config = {
_name: 'ruleset',
_attrs: {
name: "MoodleCore",
},
_content: [
{
rule: {
_attrs: {
ref: './.phpcs.xml.dist',
},
},
},
],
};
thirdPartyPaths.forEach(library => {
config._content.push({
'exclude-pattern': library,
});
});
grunt.file.write('.phpcs.xml', toXML(config, {
header: true,
indent: ' ',
}) + "\n");
};
/**
* Generate ignore files (utilising thirdpartylibs.xml data)
*/
@@ -53,6 +90,8 @@ module.exports = grunt => {
'admin/tool/componentlibrary/hugo/dist/css/docs.css',
].concat(thirdPartyPaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
phpcsIgnore(thirdPartyPaths);
};
grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
+3
View File
@@ -47,6 +47,9 @@ module.exports = grunt => {
// Load ESLint.
require('./eslint')(grunt);
// Load jsconfig.
require('./jsconfig')(grunt);
// Load JSDoc.
require('./jsdoc')(grunt);
+53
View File
@@ -0,0 +1,53 @@
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/* jshint node: true, browser: false */
/* eslint-env node */
/**
* @copyright 2022 Andrew Lyons <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
const configuration = {
compilerOptions: {
baseUrl: ".",
paths: {
},
target: "es2015",
allowSyntheticDefaultImports: false,
},
exclude: [
"node_modules",
],
include: [],
};
module.exports = (grunt) => {
const handler = () => {
const jsconfigData = Object.assign({}, configuration);
const path = require('path');
const {fetchComponentData} = require(path.join(process.cwd(), '.grunt', 'components.js'));
const componentData = fetchComponentData().components;
for (const [thisPath, component] of Object.entries(componentData)) {
jsconfigData.compilerOptions.paths[`${component}/*`] = [`${thisPath}/amd/src/*`];
jsconfigData.include.push(`${thisPath}/amd/src/**/*`);
}
grunt.file.write('jsconfig.json', JSON.stringify(jsconfigData, null, " ") + "\n");
};
grunt.registerTask('jsconfig', 'Generate a jsconfig configuration compatible with the LSP', handler);
};
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="MoodleCore">
<rule ref="moodle"/>
</ruleset>
+2 -2
View File
@@ -36,7 +36,7 @@ jobs:
- php: 7.3
env: DB=none TASK=CITEST
- php: 7.3
env: DB=none TASK=GRUNT NVM_VERSION='lts/carbon'
env: DB=none TASK=GRUNT NVM_VERSION='lts/gallium'
- if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
php: 7.3
@@ -52,7 +52,7 @@ jobs:
env: DB=none TASK=CITEST
- if: env(MOODLE_PHP) = "all"
php: 8.0
env: DB=none TASK=GRUNT NVM_VERSION='lts/carbon'
env: DB=none TASK=GRUNT NVM_VERSION='lts/gallium'
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
php: 8.0
+2 -2
View File
@@ -69,11 +69,11 @@ if ($options['help'] or (!$options['list'] and !$options['execute'])) {
die;
}
if ($options['showdebugging']) {
if ($options['showdebugging'] || !empty($CFG->showcrondebugging)) {
set_debugging(DEBUG_DEVELOPER, true);
}
if ($options['showsql']) {
if ($options['showsql'] || !empty($CFG->showcronsql)) {
$DB->set_debug(true);
}
if ($options['list']) {
+189
View File
@@ -3539,6 +3539,8 @@
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="4.0" requires="3.6">
@@ -3733,4 +3735,191 @@
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
<MOODLE version="4.1" requires="3.9">
<UNICODE level="required">
<FEEDBACK>
<ON_ERROR message="unicoderequired" />
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
<VENDOR name="mariadb" version="10.4" />
<VENDOR name="mysql" version="5.7" />
<VENDOR name="postgres" version="12" />
<VENDOR name="mssql" version="14.0" />
<VENDOR name="oracle" version="19" />
</DATABASE>
<PHP version="7.4.0" level="required">
</PHP>
<PCREUNICODE level="optional">
<FEEDBACK>
<ON_CHECK message="pcreunicodewarning" />
</FEEDBACK>
</PCREUNICODE>
<PHP_EXTENSIONS>
<PHP_EXTENSION name="iconv" level="required">
<FEEDBACK>
<ON_ERROR message="iconvrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="mbstring" level="required">
<FEEDBACK>
<ON_ERROR message="mbstringrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="curl" level="required">
<FEEDBACK>
<ON_ERROR message="curlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="openssl" level="required">
<FEEDBACK>
<ON_ERROR message="opensslrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="tokenizer" level="optional">
<FEEDBACK>
<ON_CHECK message="tokenizerrecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="soap" level="optional">
<FEEDBACK>
<ON_CHECK message="soaprecommended" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="ctype" level="required">
<FEEDBACK>
<ON_ERROR message="ctyperequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zip" level="required">
<FEEDBACK>
<ON_ERROR message="ziprequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="zlib" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="gd" level="required">
<FEEDBACK>
<ON_ERROR message="gdrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="simplexml" level="required">
<FEEDBACK>
<ON_ERROR message="simplexmlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="spl" level="required">
<FEEDBACK>
<ON_ERROR message="splrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="pcre" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="dom" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xml" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="xmlreader" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="intl" level="required">
<FEEDBACK>
<ON_ERROR message="intlrequired" />
</FEEDBACK>
</PHP_EXTENSION>
<PHP_EXTENSION name="json" level="required">
</PHP_EXTENSION>
<PHP_EXTENSION name="hash" level="required"/>
<PHP_EXTENSION name="fileinfo" level="required"/>
<PHP_EXTENSION name="sodium" level="optional"/>
<PHP_EXTENSION name="exif" level="optional"/>
</PHP_EXTENSIONS>
<PHP_SETTINGS>
<PHP_SETTING name="memory_limit" value="96M" level="required">
<FEEDBACK>
<ON_ERROR message="settingmemorylimit" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="file_uploads" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="settingfileuploads" />
</FEEDBACK>
</PHP_SETTING>
<PHP_SETTING name="opcache.enable" value="1" level="optional">
<FEEDBACK>
<ON_CHECK message="opcacherecommended" />
</FEEDBACK>
</PHP_SETTING>
</PHP_SETTINGS>
<CUSTOM_CHECKS>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbstorageengine" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
<FEEDBACK>
<ON_ERROR message="quizattemptsupgradedmessage" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
<FEEDBACK>
<ON_CHECK message="slashargumentswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
<FEEDBACK>
<ON_CHECK message="unsupporteddbtablerowformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
<FEEDBACK>
<ON_CHECK message="unoconvwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
<FEEDBACK>
<ON_CHECK message="libcurlwarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfileformat" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddbfilepertable" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
<FEEDBACK>
<ON_ERROR message="unsupporteddblargeprefix" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
<FEEDBACK>
<ON_CHECK message="ishttpswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
<FEEDBACK>
<ON_CHECK message="incompleteunicodesupport" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
<FEEDBACK>
<ON_CHECK message="sixtyfourbitswarning" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
<FEEDBACK>
<ON_CHECK message="iscustomadminwarnings" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
+2 -3
View File
@@ -59,9 +59,8 @@ class mnet_simple_host_form extends moodleform {
$wwwroot = 'http://'.$wwwroot;
}
if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
global $CFG;
return array('wwwroot' => get_string('hostexists', 'mnet',
new moodle_url('/admin/mnet/peers.php', array('hostid' => $host->id))));
$str = get_string('hostexists', 'mnet', (new moodle_url('/admin/mnet/peers.php', ['hostid' => $host->id]))->out());
return array('wwwroot' => $str);
}
return array();
}
+15 -4
View File
@@ -38,11 +38,22 @@
}
if (!empty($show) and confirm_sesskey()) {
$class = \core_plugin_manager::resolve_plugininfo_class('mod');
$class::enable_plugin($show, true);
$canenablemodule = true;
$modulename = $show;
admin_get_root(true, false); // settings not required - only pages
redirect(new moodle_url('/admin/modules.php'));
// Invoking a callback function that enables plugins to force additional actions (e.g. displaying notifications,
// modals, etc.) and also specify through its returned value (bool) whether the process of enabling the plugin
// should continue after these actions or not.
if (component_callback_exists("mod_{$modulename}", 'pre_enable_plugin_actions')) {
$canenablemodule = component_callback("mod_{$modulename}", 'pre_enable_plugin_actions');
}
if ($canenablemodule) {
$class = \core_plugin_manager::resolve_plugininfo_class('mod');
$class::enable_plugin($show, true);
admin_get_root(true, false); // Settings not required - only pages.
redirect(new moodle_url('/admin/modules.php'));
}
}
echo $OUTPUT->header();
@@ -87,8 +87,12 @@ class core_role_admins_existing_selector extends user_selector_base {
} else {
$groupnameprefix = get_string('extusers', 'core_role');
foreach ($availableusers as $user) {
$domain = substr($user->email, strpos($user->email, '@'));
$groupname = "$groupnameprefix $domain";
if (isset($user->email)) {
$domain = substr($user->email, strpos($user->email, '@'));
$groupname = "$groupnameprefix $domain";
} else {
$groupname = $groupnameprefix;
}
$result[$groupname][] = $user;
}
}
+7 -7
View File
@@ -14,19 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core_role;
use core_role_preset;
/**
* Role XML presets test case.
*
* @package core_role
* @category phpunit
* @category test
* @copyright 2013 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
class core_role_preset_testcase extends advanced_testcase {
class preset_test extends \advanced_testcase {
public function test_xml() {
global $DB;
@@ -61,7 +61,7 @@ class core_role_preset_testcase extends advanced_testcase {
FROM {role_capabilities}
WHERE contextid = :syscontext AND roleid = :roleid
ORDER BY capability ASC",
array('syscontext'=>context_system::instance()->id, 'roleid'=>$role->id));
array('syscontext' => \context_system::instance()->id, 'roleid' => $role->id));
foreach ($capabilities as $cap) {
$this->assertEquals($cap->permission, $info['permissions'][$cap->capability]);
+10 -9
View File
@@ -33,8 +33,16 @@ if (!($settingspage->check_access())) {
die;
}
$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
if ($hassiteconfig) {
// If the context in the admin_settingpage object is explicitly defined and it is not system, reset the current
// page context and use that one instead. This ensures that the proper navigation is displayed and highlighted.
if ($settingspage->context && !$settingspage->context instanceof \context_system) {
$PAGE->set_context($settingspage->context);
}
$hassiteconfig = has_capability('moodle/site:config', context_system::instance());
// Display the admin search input element in the page header if the user has the capability to change the site
// configuration and the current page context is system.
if ($hassiteconfig && $PAGE->context instanceof \context_system) {
$PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
'action' => new moodle_url('/admin/search.php'),
]));
@@ -125,13 +133,6 @@ if (empty($SITE->fullname)) {
$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
$PAGE->set_heading($SITE->fullname);
if ($section === 'frontpagesettings') {
$frontpagenode = $PAGE->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
$frontpagenode->make_active();
$PAGE->navbar->add(get_string('frontpage', 'admin'),
new moodle_url('/admin/category.php', ['category' => 'frontpage']));
$PAGE->navbar->add(get_string('frontpagesettings', 'admin'), $PAGE->url);
}
echo $OUTPUT->header();
if ($errormsg !== '') {
+9
View File
@@ -88,6 +88,15 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
$downloadcontentsitedefault->add_dependent_on('downloadcoursecontentallowed');
$temp->add($downloadcontentsitedefault);
$temp->add(
new admin_setting_configtext(
'moodlecourse/participantsperpage',
new lang_string('participants:perpage', 'course'),
new lang_string('participants:perpage_help', 'course'),
20
)
);
// Course format.
$temp->add(new admin_setting_heading('courseformathdr', new lang_string('type_format', 'plugin'), ''));
+4 -1
View File
@@ -527,7 +527,10 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
$plugin->load_settings($ADMIN, 'plagiarism', $hassiteconfig);
}
}
$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));
// Comments report, note this page is really just a means to delete comments so check that.
$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot . '/comment/index.php',
'moodle/comment:delete'));
// Course reports settings
if ($hassiteconfig) {
+2 -1
View File
@@ -240,7 +240,8 @@ if ($hassiteconfig
if ($field->param2 > 255 || $field->datatype != 'text') {
continue;
}
$fields['profile_field_' . $field->shortname] = $field->name . ' *';
$fields['profile_field_' . $field->shortname] = format_string($field->name, true,
['context' => context_system::instance()]) . ' *';
}
return $fields;
+4 -2
View File
@@ -18,6 +18,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
And the following "cohorts" exist:
| name | idnumber |
| Cohort 1 | CH1 |
And the following "cohort members" exist:
| user | cohort |
| user2 | CH1 |
| user3 | CH1 |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
@@ -27,8 +31,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
| user2 | C1 | student |
| user3 | C1 | student |
And I log in as "admin"
And I add "User Two (two@example.com)" user to "CH1" cohort members
And I add "User Three (three@example.com)" user to "CH1" cohort members
And I navigate to "Users > Accounts > Browse list of users" in site administration
Scenario: Filter user accounts by role and cohort
+1 -1
View File
@@ -63,7 +63,7 @@ Feature: View task logs report and use its filters
Then I should see "Filters applied"
And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
And I should see "Nothing to display"
And I click on "Reset" "button" in the "[data-region='report-filters']" "css_element"
And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
And I should see "Filters reset"
And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
@@ -1,18 +1,20 @@
@tool @tool_admin_presets
Feature: I can download a preset
Background:
Given I log in as "admin"
And the following "tool_admin_presets > preset" exist:
Given the following "tool_admin_presets > preset" exist:
| name |
| Custom preset |
And I navigate to "Site admin presets" in site administration
@javascript
Scenario: Core and custom preset settings can be downloaded
Scenario: Custom preset settings can be downloaded
Given I log in as "admin"
And I navigate to "Site admin presets" in site administration
When I open the action menu in "Custom preset" "table_row"
Then following "Download" "link" in the "Custom preset" "table_row" should download between "0" and "5000" bytes
And I open the action menu in "Starter" "table_row"
And following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes
@javascript
Scenario: Core preset settings can be downloaded
Given I log in as "admin"
And I navigate to "Site admin presets" in site administration
When I open the action menu in "Starter" "table_row"
Then following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_deleted
* @covers \tool_admin_presets\event\preset_deleted
*/
class preset_deleted_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_downloaded
* @covers \tool_admin_presets\event\preset_downloaded
*/
class preset_downloaded_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_exported
* @covers \tool_admin_presets\event\preset_exported
*/
class preset_exported_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_imported
* @covers \tool_admin_presets\event\preset_imported
*/
class preset_imported_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_loaded
* @covers \tool_admin_presets\event\preset_loaded
*/
class preset_loaded_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_previewed
* @covers \tool_admin_presets\event\preset_previewed
*/
class preset_previewed_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\preset_reverted
* @covers \tool_admin_presets\event\preset_reverted
*/
class preset_reverted_test extends \advanced_testcase {
@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \tool_admin_presets\event\presets_listed
* @covers \tool_admin_presets\event\presets_listed
*/
class presets_listed_test extends \advanced_testcase {
@@ -7,8 +7,8 @@ Feature: Behat steps for interacting with form work
@javascript
Scenario: Test fields in containers
Given the following "courses" exist:
| fullname | shortname |
| Course 1 | C1 |
| fullname | shortname | summary | summaryformat |
| Course 1 | C1 | Red | 1 |
When I log in as "admin"
And I am on "Course 1" course homepage
# Just get to any form.
@@ -17,11 +17,15 @@ Feature: Behat steps for interacting with form work
And I set the following fields in the "Appearance" "fieldset" to these values:
| Show activity reports | Yes |
| Number of announcements | 1 |
And I set the following fields in the "Description" "fieldset" to these values:
| Course summary | Green |
Then the field "Show activity reports" in the "Appearance" "fieldset" matches value "Yes"
And the field "Show activity reports" in the "Appearance" "fieldset" does not match value "No"
And the following fields in the "region-main" "region" match these values:
| Course full name | Frog |
| Number of announcements | 1 |
| Course summary | Green |
And the following fields in the "region-main" "region" do not match these values:
| Course full name | Course 1 |
| Number of announcements | 5 |
| Course summary | Red |
@@ -20,9 +20,10 @@ Feature: Forms manipulation
Given the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And I add a "Quiz" to section "1"
And the following "activities" exist:
| activity | course | section | name |
| quiz | C1 | 1 | Quiz 1 |
And I am on the "Quiz 1" "quiz activity editing" page logged in as admin
When I expand all fieldsets
Then I should see "Close the quiz"
And I should see "Group mode"
@@ -323,7 +323,7 @@ class accessibility {
/**
* This function runs one specified check on the html item
*
* @param string $html The html string to be analysed; might be NULL.
* @param string|null $html The html string to be analysed; might be NULL.
* @param int $contentid The content area ID
* @param int $errid The error ID
* @param string $check The check name to run
@@ -333,7 +333,7 @@ class accessibility {
* @throws \dml_exception
*/
public static function run_one_check(
string $html = null,
?string $html,
int $contentid,
int $errid,
string $check,
@@ -248,7 +248,7 @@ $string['printable:toolname'] = 'Summary report';
$string['printable:toolshortname'] = 'Summary report';
$string['printable:downloadpdf'] = 'Download PDF';
$string['printable:printreport'] = 'Printable report';
$string['error:nocoursespecified'] = 'This summary report requires a valid course id. Please access the accessibility toolkit from within a course, via the actions menu, which will then supply this required course id.';
$string['error:nocoursespecified'] = 'The summary report requires a valid course ID. Please access the accessibility toolkit from within a course.';
$string['pdf:filename'] = 'Brickfield_Summaryreport_CourseID-{$a}';
// Advanced page.
+3
View File
@@ -44,5 +44,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
+6 -5
View File
@@ -36,7 +36,7 @@ Useful for uploading custom langstrings to AMOS or importing or syncing them to
Options:
-l, --lang Comma seperated language ids to export, default: all
-c, --components Comma seperated components to export, default: all
-t, --target Target to copy the zip files to, default: $CFG->tempdir/customlang
-t, --target Target directory to copy the zip files to, default: $CFG->tempdir/customlang
-o, --overwrite Overwrite existing files in the target folder.
Note: If the target is not set, the files are always overwritten!
-h, --help Print out this help
@@ -73,9 +73,10 @@ if ($options['help']) {
echo $usage;
die;
}
if (!file_exists($options['target'])) {
mkdir($options['target'], 0777, true);
}
// Ensure target directory exists.
$options['target'] = rtrim($options['target'], '/') . '/';
check_dir_exists($options['target']);
cli_writeln(get_string('cliexportheading', 'tool_customlang'));
$langs = [];
@@ -90,7 +91,7 @@ foreach ($langs as $lang) {
$filename = $options['target'] . get_string('exportzipfilename', 'tool_customlang', ['lang' => $lang]);
// If the file exists and we are not using the temp folder it requires an ovewrite.
if ($options['target'] != $dafaulttarget && file_exists($filename) && !$options['overwrite']) {
cli_problem(get_string('cliexportfileexists', 'tool_customlang', $lang));
cli_problem(get_string('cliexportfileexists', 'tool_customlang', ['lang' => $lang]));
continue;
}
cli_heading(get_string('cliexportstartexport', 'tool_customlang', $lang));
+10
View File
@@ -160,6 +160,16 @@ foreach ($langfiles as $lng => $files) {
cli_heading(get_string('clifiles', 'tool_customlang', $lng));
// If we intend to check in any changes, we must first check them out.
if ($checkin) {
cli_writeln(get_string('checkout', 'tool_customlang'));
$progressbar = new progress_bar();
$progressbar->create();
tool_customlang_utils::checkout($lng, $progressbar);
}
foreach ($files as $file) {
// Generate a valid stored_file from this file.
$record = (object)[
+3
View File
@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -50,6 +50,7 @@ $string['customlang:export'] = 'Export local translation';
$string['customlang:view'] = 'View local translation';
$string['export'] = 'Export custom strings';
$string['exportfilter'] = 'Select component(s) to export';
$string['exportzipfilename'] = 'customlang-export-{$a->lang}.zip';
$string['editlangpack'] = 'Edit language pack';
$string['filter'] = 'Filter strings';
$string['filtercomponent'] = 'Show strings of these components';
+3 -1
View File
@@ -89,7 +89,9 @@ class tool_customlang_utils {
* @param progress_bar $progressbar optionally, the given progress bar can be updated
*/
public static function checkout($lang, progress_bar $progressbar = null) {
global $DB;
global $DB, $CFG;
require_once("{$CFG->libdir}/adminlib.php");
// For behat executions we are going to load only a few components in the
// language customisation structures. Using the whole "en" langpack is
+13 -1
View File
@@ -786,6 +786,18 @@ class api {
return true;
}
/**
* Check if user has permission to create data download request for themselves
*
* @param int|null $userid
* @return bool
*/
public static function can_create_data_download_request_for_self(int $userid = null): bool {
global $USER;
$userid = $userid ?: $USER->id;
return has_capability('tool/dataprivacy:downloadownrequest', \context_user::instance($userid), $userid);
}
/**
* Check if user has permisson to create data deletion request for themselves.
*
@@ -847,7 +859,7 @@ class api {
$usercontext = \context_user::instance($userid);
// If it's your own and you have the right capability, you can download it.
if ($userid == $downloaderid && has_capability('tool/dataprivacy:downloadownrequest', $usercontext, $downloaderid)) {
if ($userid == $downloaderid && self::can_create_data_download_request_for_self($downloaderid)) {
return true;
}
// If you can download anyone's in that context, you can download it.
@@ -96,6 +96,11 @@ if ($data = $mform->get_data()) {
throw new moodle_exception('nopermissions', 'error', '',
get_string('errorcannotrequestdeleteforother', 'tool_dataprivacy'));
}
} else if ($data->type == \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT) {
if ($data->userid == $USER->id && !\tool_dataprivacy\api::can_create_data_download_request_for_self()) {
throw new moodle_exception('nopermissions', 'error', '',
get_string('errorcannotrequestexportforself', 'tool_dataprivacy'));
}
}
\tool_dataprivacy\api::create_data_request($data->userid, $data->type, $data->comments);
@@ -97,10 +97,11 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
$mform->setType('userid', PARAM_INT);
// Subject access request type.
$options = [
api::DATAREQUEST_TYPE_EXPORT => get_string('requesttypeexport', 'tool_dataprivacy'),
api::DATAREQUEST_TYPE_DELETE => get_string('requesttypedelete', 'tool_dataprivacy')
];
$options = [];
if ($this->manage || api::can_create_data_download_request_for_self()) {
$options[api::DATAREQUEST_TYPE_EXPORT] = get_string('requesttypeexport', 'tool_dataprivacy');
}
$options[api::DATAREQUEST_TYPE_DELETE] = get_string('requesttypedelete', 'tool_dataprivacy');
$mform->addElement('select', 'type', get_string('requesttype', 'tool_dataprivacy'), $options);
$mform->addHelpButton('type', 'requesttype', 'tool_dataprivacy');
@@ -174,7 +175,7 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
$errors['type'] = get_string('errorrequestalreadyexists', 'tool_dataprivacy');
}
// Check if current user can create data deletion request.
// Check if current user can create data requests.
if ($data->type == api::DATAREQUEST_TYPE_DELETE) {
if ($userid == $USER->id) {
if (!api::can_create_data_deletion_request_for_self()) {
@@ -184,6 +185,10 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
&& !api::can_create_data_deletion_request_for_children($userid)) {
$errors['type'] = get_string('errorcannotrequestdeleteforother', 'tool_dataprivacy');
}
} else if ($data->type == api::DATAREQUEST_TYPE_EXPORT) {
if ($userid == $USER->id && !api::can_create_data_download_request_for_self()) {
$errors['type'] = get_string('errorcannotrequestexportforself', 'tool_dataprivacy');
}
}
return $errors;
+3
View File
@@ -78,5 +78,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2020061501, 'tool', 'dataprivacy');
}
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -135,6 +135,7 @@ $string['effectiveretentionperioduser'] = '{$a} (since the last time the user ac
$string['emailsalutation'] = 'Dear {$a},';
$string['errorcannotrequestdeleteforself'] = 'You don\'t have permission to create deletion request for yourself.';
$string['errorcannotrequestdeleteforother'] = 'You don\'t have permission to create deletion request for this user.';
$string['errorcannotrequestexportforself'] = 'You don\'t have permission to create export request for yourself.';
$string['errorcontactdpodisabled'] = 'The option to contact the privacy officer is disabled.';
$string['errorinvalidrequestcomments'] = 'The comments field may contain plain text only.';
$string['errorinvalidrequestcreationmethod'] = 'Invalid request creation method!';
+3 -2
View File
@@ -68,8 +68,9 @@ function tool_dataprivacy_myprofile_navigation(tree $tree, $user, $iscurrentuser
// Check if the user has an ongoing data export request.
$hasexportrequest = \tool_dataprivacy\api::has_ongoing_request($user->id, \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT);
// Show data export link only if the user doesn't have an ongoing data export request.
if (!$hasexportrequest) {
// Show data export link only if the user doesn't have an ongoing data export request and has permission
// to download own data.
if (!$hasexportrequest && \tool_dataprivacy\api::can_create_data_download_request_for_self()) {
$exportparams = ['type' => \tool_dataprivacy\api::DATAREQUEST_TYPE_EXPORT];
$exporturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php', $exportparams);
$exportnode = new core_user\output\myprofile\node('privacyandpolicies', 'requestdataexport',
+22
View File
@@ -26,6 +26,7 @@ use tool_dataprivacy\task\process_data_request_task;
* API tests.
*
* @package tool_dataprivacy
* @covers \tool_dataprivacy\api
* @copyright 2018 Jun Pataleta
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -2174,6 +2175,27 @@ class api_test extends \advanced_testcase {
return $request;
}
/**
* Test whether user can create data download request for themselves
*/
public function test_can_create_data_download_request_for_self(): void {
global $DB;
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
// The default user role allows for the creation of download data requests.
$this->assertTrue(api::can_create_data_download_request_for_self());
// Prohibit that capability.
$userrole = $DB->get_field('role', 'id', ['shortname' => 'user'], MUST_EXIST);
assign_capability('tool/dataprivacy:downloadownrequest', CAP_PROHIBIT, $userrole, \context_user::instance($user->id));
$this->assertFalse(api::can_create_data_download_request_for_self());
}
/**
* Test user cannot create data deletion request for themselves if they don't have
* "tool/dataprivacy:requestdelete" capability.
@@ -14,17 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the data_registry class.
*
* @package tool_dataprivacy
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
use \tool_dataprivacy\data_registry;
namespace tool_dataprivacy;
/**
* Unit tests for the data_registry class.
@@ -33,7 +23,7 @@ use \tool_dataprivacy\data_registry;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
class data_registry_test extends \advanced_testcase {
/**
* Ensure that the get_effective_context_value only errors if provided an inappropriate element.
@@ -41,7 +31,7 @@ class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
* This test is not great because we only test a limited set of values. This is a fault of the underlying API.
*/
public function test_get_effective_context_value_invalid_element() {
$this->expectException(coding_exception::class);
$this->expectException(\coding_exception::class);
data_registry::get_effective_context_value(\context_system::instance(), 'invalid');
}
@@ -51,7 +41,7 @@ class tool_dataprivacy_dataregistry_testcase extends advanced_testcase {
* This test is not great because we only test a limited set of values. This is a fault of the underlying API.
*/
public function test_get_effective_contextlevel_value_invalid_element() {
$this->expectException(coding_exception::class);
$this->expectException(\coding_exception::class);
data_registry::get_effective_contextlevel_value(\context_system::instance(), 'invalid');
}
}
@@ -14,19 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Tests for the data_request persistent.
*
* @package tool_dataprivacy
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_dataprivacy;
use data_privacy_testcase;
defined('MOODLE_INTERNAL') || die();
require_once('data_privacy_testcase.php');
use tool_dataprivacy\api;
/**
* Tests for the data_request persistent.
*
@@ -34,7 +28,7 @@ use tool_dataprivacy\api;
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_data_request_testcase extends data_privacy_testcase {
class data_request_test extends data_privacy_testcase {
/**
* Data provider for testing is_resettable, and is_active.
@@ -14,25 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Expired contexts tests.
*
* @package tool_dataprivacy
* @copyright 2018 David Monllao
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
use tool_dataprivacy\api;
use tool_dataprivacy\data_registry;
use tool_dataprivacy\expired_context;
use tool_dataprivacy\purpose;
use tool_dataprivacy\purpose_override;
use tool_dataprivacy\category;
use tool_dataprivacy\contextlevel;
use tool_dataprivacy\expired_contexts_manager;
defined('MOODLE_INTERNAL') || die();
global $CFG;
namespace tool_dataprivacy;
/**
* Expired contexts tests.
@@ -41,7 +23,7 @@ global $CFG;
* @copyright 2018 David Monllao
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_expired_contexts_testcase extends advanced_testcase {
class expired_contexts_test extends \advanced_testcase {
/**
* Setup the basics with the specified retention period.
@@ -14,21 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Expired data requests tests.
*
* @package tool_dataprivacy
* @copyright 2018 Michael Hawkins
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_dataprivacy;
use tool_dataprivacy\api;
use tool_dataprivacy\category;
use tool_dataprivacy\data_request;
use tool_dataprivacy\purpose;
use data_privacy_testcase;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once('data_privacy_testcase.php');
@@ -39,7 +29,7 @@ require_once('data_privacy_testcase.php');
* @copyright 2018 Michael Hawkins
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_expired_data_requests_testcase extends data_privacy_testcase {
class expired_data_requests_test extends data_privacy_testcase {
/**
* Test tearDown.
@@ -59,7 +49,7 @@ class tool_dataprivacy_expired_data_requests_testcase extends data_privacy_testc
// Set up test users.
$this->setAdminUser();
$studentuser = $this->getDataGenerator()->create_user();
$studentusercontext = context_user::instance($studentuser->id);
$studentusercontext = \context_user::instance($studentuser->id);
$dpouser = $this->getDataGenerator()->create_user();
$this->assign_site_dpo($dpouser);
@@ -14,13 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the filtered_userlist.
*
* @package tool_dataprivacy
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_dataprivacy;
/**
* Unit tests for the filtered_userlist.
@@ -29,7 +23,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_filtered_userlist_testcase extends advanced_testcase {
class filtered_userlist_test extends \advanced_testcase {
/**
* Test the apply_expired_contexts_filters function with arange of options.
*
@@ -14,6 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_dataprivacy;
use data_privacy_testcase;
defined('MOODLE_INTERNAL') || die();
require_once('data_privacy_testcase.php');
/**
* Tests for the manager observer.
*
@@ -21,18 +28,7 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
require_once('data_privacy_testcase.php');
/**
* API tests.
*
* @package tool_dataprivacy
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_manager_observer_testcase extends data_privacy_testcase {
class manager_observer_test extends data_privacy_testcase {
/**
* Ensure that when users are configured as DPO, they are sent an message upon failure.
*/
@@ -14,16 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Metadata registry tests.
*
* @package tool_dataprivacy
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
namespace tool_dataprivacy;
/**
* Metadata registry tests.
@@ -32,7 +23,7 @@ global $CFG;
* @copyright 2018 Adrian Greeve <adriangreeve.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_metadata_registry_testcase extends advanced_testcase {
class metadata_registry_test extends \advanced_testcase {
/**
* Fetch the meta data and return it in a form that we can easily unit test.
@@ -14,18 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Tests for the event observer.
*
* @package tool_dataprivacy
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_dataprivacy;
defined('MOODLE_INTERNAL') || die();
use \tool_dataprivacy\event\user_deleted_observer;
use \tool_dataprivacy\api;
use tool_dataprivacy\event\user_deleted_observer;
/**
* Event observer test.
@@ -34,7 +25,7 @@ use \tool_dataprivacy\api;
* @copyright 2018 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_dataprivacy_user_deleted_observer_testcase extends advanced_testcase {
class user_deleted_observer_test extends \advanced_testcase {
/**
* Ensure that a delete data request is created upon user deletion.
+6
View File
@@ -0,0 +1,6 @@
This file describes API changes in /admin/tool/dataprivacy/*
Information provided here is intended especially for developers.
=== 4.0.2 ===
* New `api::can_create_data_download_request_for_self` method for determining whether user has permission to create their
own data download requests
@@ -14,7 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
defined('MOODLE_INTERNAL') || die();
namespace tool_generator;
use tool_generator_course_backend;
/**
* Automated unit testing. This tests the 'make large course' backend,
@@ -24,7 +26,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2013 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_generator_maketestcourse_testcase extends advanced_testcase {
class maketestcourse_test extends \advanced_testcase {
/**
* Creates a small test course and checks all the components have been put in place.
*/
@@ -52,7 +54,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
// Get course details.
$course = get_course($courseid);
$context = context_course::instance($courseid);
$context = \context_course::instance($courseid);
$modinfo = get_fast_modinfo($course);
// Check course names.
@@ -88,7 +90,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
// Check it contains 2 files (the default txt and a dat file).
$fs = get_file_storage();
$resourcecontext = context_module::instance($resource->id);
$resourcecontext = \context_module::instance($resource->id);
$files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
$files = array_values($files);
$this->assertEquals(2, count($files));
@@ -106,7 +108,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
$this->assertTrue($ok);
// Check it contains 2 files.
$resourcecontext = context_module::instance($resource->id);
$resourcecontext = \context_module::instance($resource->id);
$files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
$files = array_values($files);
$this->assertEquals(2, count($files));
@@ -155,7 +157,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
$lastusernumber = 0;
$discussionstarters = array();
foreach ($discussions as $discussion) {
$usernumber = core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;
$usernumber = \core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;
// Checks that the users are odd numbers.
$this->assertEquals(1, $usernumber % 2);
@@ -190,7 +192,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
$fs = get_file_storage();
$resources = $modinfo->get_instances_of('resource');
foreach ($resources as $resource) {
$resourcecontext = context_module::instance($resource->id);
$resourcecontext = \context_module::instance($resource->id);
$files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
foreach ($files as $file) {
if ($file->get_mimetype() == 'application/octet-stream') {
@@ -210,7 +212,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
$fs = get_file_storage();
$resources = $modinfo->get_instances_of('resource');
foreach ($resources as $resource) {
$resourcecontext = context_module::instance($resource->id);
$resourcecontext = \context_module::instance($resource->id);
$files = $fs->get_area_files($resourcecontext->id, 'mod_resource', 'content', false, 'filename', false);
foreach ($files as $file) {
if ($file->get_mimetype() == 'application/octet-stream') {
@@ -22,27 +22,12 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_generator;
use tool_generator_site_backend;
defined('MOODLE_INTERNAL') || die();
/**
* Silly class to access site_backend internal methods.
*
* @package tool_generator
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class testable_tool_generator_site_backend extends tool_generator_site_backend {
/**
* Public accessor.
*
* @return int
*/
public static function get_last_testcourse_id() {
return parent::get_last_testcourse_id();
}
}
/**
* Unit test for the site generator
*
@@ -50,7 +35,7 @@ class testable_tool_generator_site_backend extends tool_generator_site_backend {
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_generator_maketestsite_testcase extends advanced_testcase {
class maketestsite_test extends \advanced_testcase {
/**
* Checks that site courses shortnames are properly generated.
@@ -102,5 +87,22 @@ class tool_generator_maketestsite_testcase extends advanced_testcase {
$lastshortname = testable_tool_generator_site_backend::get_last_testcourse_id();
$this->assertEquals(20, $lastshortname);
}
}
/**
* Silly class to access site_backend internal methods.
*
* @copyright 2013 David Monllaó
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class testable_tool_generator_site_backend extends tool_generator_site_backend {
/**
* Public accessor.
*
* @return int
*/
public static function get_last_testcourse_id() {
return parent::get_last_testcourse_id();
}
}
@@ -22,8 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_httpsreplace\tests;
namespace tool_httpsreplace;
defined('MOODLE_INTERNAL') || die();
Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 329 B

+1 -1
View File
@@ -1,3 +1,3 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M16 9v6c0 .5-.5 1-1 1H1c-.5 0-1-.5-1-1V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1v4h10V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1zm-3.6-3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-.8.8V1c0-.5-.4-1-1-1h-1c-.5 0-1 .5-1 1v4.2l-.8-.8c-.4-.4-1-.4-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.7 3.7c.2.2.5.3.7.3.3 0 .5-.1.7-.3l3.7-3.7c.4-.3.4-1 0-1.4z" fill="#999"/></svg>
]><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M16 9v6c0 .5-.5 1-1 1H1c-.5 0-1-.5-1-1V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1v4h10V9c0-.5.5-1 1-1h1c.5 0 1 .5 1 1zm-3.6-3.9l-.7-.7c-.4-.4-1-.4-1.4 0l-.8.8V1c0-.5-.4-1-1-1h-1c-.5 0-1 .5-1 1v4.2l-.8-.8c-.4-.4-1-.4-1.4 0l-.7.7c-.4.4-.4 1 0 1.4l3.7 3.7c.2.2.5.3.7.3.3 0 .5-.1.7-.3l3.7-3.7c.4-.3.4-1 0-1.4z" fill="#888"/></svg>

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 618 B

@@ -15,14 +15,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Provides the unit tests class and some helper classes
*
* @package tool_installaddon
* @category test
* @copyright 2013 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_installaddon;
use testable_tool_installaddon_installer;
use tool_installaddon_installer;
defined('MOODLE_INTERNAL') || die();
@@ -32,10 +28,12 @@ require_once(__DIR__.'/fixtures/testable_installer.php');
/**
* Unit tests for the {@link tool_installaddon_installer} class
*
* @package tool_installaddon
* @category test
* @copyright 2013 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_installaddon_installer_testcase extends advanced_testcase {
class installer_test extends \advanced_testcase {
public function test_get_addons_repository_url() {
$installer = testable_tool_installaddon_installer::instance();
@@ -124,6 +124,12 @@ class controller {
}
if ($rm1 or $rm2) {
// Set the default site language to en if the deleted language pack is the default site language.
if ($CFG->lang === $lang) {
set_config('lang', 'en');
// Fix the user's current language to the default site language.
fix_current_language($CFG->lang);
}
$this->info[] = get_string('langpackremoved', 'tool_langimport', $lang);
event\langpack_removed::event_with_langcode($lang)->trigger();
return true;
+5 -3
View File
@@ -22,15 +22,17 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
namespace tool_langimport;
/**
* Tests for \tool_langimport\locale class.
*
* @package tool_langimport
* @category test
* @copyright 2018 Université Rennes 2 {@link https://www.univ-rennes2.fr}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class locale_testcase extends \advanced_testcase {
class locale_test extends \advanced_testcase {
/**
* Test that \tool_langimport\locale::check_locale_availability() works as expected.
*
@@ -65,7 +67,7 @@ class locale_testcase extends \advanced_testcase {
// Test an invalid parameter.
$locale = new \tool_langimport\locale();
$this->expectException(coding_exception::class);
$this->expectException(\coding_exception::class);
$locale->check_locale_availability('');
}
}
+3
View File
@@ -45,5 +45,8 @@ function xmldb_tool_log_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -46,5 +46,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -46,5 +46,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 510 B

+1 -1
View File
@@ -9,7 +9,7 @@
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#999999;" d="M8.5,9.5C8.8,10,9,10.6,9,11.2c0,0.6-0.3,1.1-0.7,1.6l-2.5,2.5C5.2,15.8,4.7,16,4,16
<path style="fill:#888;" d="M8.5,9.5C8.8,10,9,10.6,9,11.2c0,0.6-0.3,1.1-0.7,1.6l-2.5,2.5C5.2,15.8,4.7,16,4,16
s-1.3-0.2-1.7-0.7l-1.5-1.5C0.2,13.3,0,12.7,0,12c0-0.7,0.2-1.3,0.7-1.7l2.5-2.5C3.7,7.3,4.3,7,5,7c0.5,0,1,0.2,1.5,0.5l-1,1
C5.3,8.5,5.2,8.4,5,8.4c-0.3,0-0.5,0.1-0.8,0.3l-2.5,2.5c-0.2,0.2-0.3,0.5-0.3,0.7c0,0.3,0.1,0.5,0.3,0.7l1.5,1.5
c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3l2.5-2.5c0.2-0.2,0.3-0.5,0.3-0.8c0-0.2,0-0.3-0.1-0.4L8.5,9.5z M5,10L10,5

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -77,9 +77,10 @@
ucw.registerEvents('[data-region="user-competency-status"]');
ucw.on('status-changed', infoReloader.reload.bind(infoReloader));
ucw.on('error-occured', infoReloader.reload.bind(infoReloader));
var inlineGrader = new mod('#rate_{{uniqid}}', '{{competency.scaleid}}', '{{competency.competency.id}}', '{{user.id}}', '{{plan.id}}', '', '{{#str}}chooserating, tool_lp{{/str}}');
inlineGrader.on('competencyupdated', infoReloader.reload.bind(infoReloader));
{{#cangrade}}
var inlineGrader = new mod('#rate_{{uniqid}}', '{{competency.scaleid}}', '{{competency.competency.id}}', '{{user.id}}', '{{plan.id}}', '', '{{#str}}chooserating, tool_lp{{/str}}');
inlineGrader.on('competencyupdated', infoReloader.reload.bind(infoReloader));
{{/cangrade}}
});
{{/js}}
{{/usercompetency}}
@@ -95,13 +95,14 @@
{{#js}}
require(['jquery', 'tool_lp/grade_user_competency_inline', 'tool_lp/user_competency_info'], function($, mod, info) {
var inlineGrader = new mod('#rate_{{uniqid}}', '{{competency.scaleid}}', '{{competency.competency.id}}', '{{user.id}}', '', '{{course.id}}', '{{#str}}chooserating, tool_lp{{/str}}');
var competencyElement = $('[data-region-id="{{uniqid}}"]');
var displayuser = ('{{displayuser}}' == 'true') ? true : false;
var infoReloader = new info(competencyElement, '{{competency.competency.id}}', '{{user.id}}', '', '{{course.id}}', displayuser);
inlineGrader.on('competencyupdated', infoReloader.reload.bind(infoReloader));
{{#cangrade}}
var inlineGrader = new mod('#rate_{{uniqid}}', '{{competency.scaleid}}', '{{competency.competency.id}}', '{{user.id}}', '', '{{course.id}}', '{{#str}}chooserating, tool_lp{{/str}}');
inlineGrader.on('competencyupdated', infoReloader.reload.bind(infoReloader));
{{/cangrade}}
});
{{/js}}
@@ -63,4 +63,67 @@ class behat_tool_lp extends behat_base {
$this->execute('behat_general::i_click_on', [$xpathtarget, 'xpath_element']);
}
/**
* Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
*
* Recognised page names are:
* | pagetype | name meaning | description |
* | Course competencies | Course name | The course competencies page |
*
* @param string $page identifies which type of page this is, e.g. 'Course competencies'.
* @param string $identifier identifies the particular page, e.g. 'C1'.
* @return moodle_url the corresponding URL.
* @throws Exception with a meaningful error message if the specified page cannot be found.
*/
protected function resolve_page_instance_url(string $page, string $identifier): moodle_url {
switch (strtolower($page)) {
case 'course competencies':
$courseid = $this->get_course_id($identifier);
return new moodle_url('/admin/tool/lp/coursecompetencies.php', [
'courseid' => $courseid,
]);
default:
throw new Exception("Unrecognised page type '{$page}'");
}
}
/**
* Return a list of the exact named selectors for the component.
*
* @return behat_component_named_selector[]
*/
public static function get_exact_named_selectors(): array {
return [
new behat_component_named_selector('competency', [
"//*[@data-region='coursecompetencies']//table[contains(@class,'managecompetencies')]".
"//tr[contains(., //a[@title='View details'][contains(., %locator%)])]",
]),
new behat_component_named_selector('learning plan', [
"//*[@data-region='plan-competencies']//table[contains(@class,'managecompetencies')]".
"//tr[@data-node='user-competency'][contains(., //a[@data-usercompetency='true'][contains(., %locator%)])]",
]),
new behat_component_named_selector('competency description', [
"//td/p[contains(., %locator%)]",
]),
new behat_component_named_selector('competency grade', [
"//span[contains(concat(' ', normalize-space(@class), ' '), ' badge ')][contains(., %locator%)]",
]),
new behat_component_named_selector('learning plan rating', [
"//td[position()=2][contains(., %locator%)]",
]),
new behat_component_named_selector('learning plan proficiency', [
"//td[position()=3][contains(., %locator%)]",
]),
new behat_component_named_selector('competency page proficiency', [
"//dt[contains(., 'Proficient')]/following-sibling::dd[1][contains(., %locator%)]",
]),
new behat_component_named_selector('competency page rating', [
"//dt[contains(., 'Rating')]/following-sibling::dd[1][contains(., %locator%)]",
]),
new behat_component_named_selector('competency page related competency', [
"//*[@data-region='relatedcompetencies']//a[contains(., %locator%)]",
]),
];
}
}
@@ -0,0 +1,187 @@
@tool @tool_lp @javascript
Feature: View competencies
In order to access competency information
As a user
I need to view user competencies
Background:
Given the following "users" exist:
| username | firstname | lastname |
| student1 | Student | first |
| teacher1 | Teacher | first |
And the following "system role assigns" exist:
| user | role | contextlevel |
| teacher1 | editingteacher | System |
And the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/competency:planview | Allow | editingteacher | System | |
And the following "courses" exist:
| fullname | shortname |
| Course 1 | C1 |
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
| teacher1 | C1 | editingteacher |
And the following "scales" exist:
| name | scale |
| Test Scale | Bad, Good, Great |
And the following "core_competency > frameworks" exist:
| shortname | idnumber | scale |
| Cookery | cookery | Test Scale |
| Literacy | literacy | Test Scale |
And the following "core_competency > competencies" exist:
| shortname | idnumber | description | competencyframework |
| Salads | salads | Salads are important | cookery |
| Desserts | desserts | Desserts are important | cookery |
| Cakes | cakes | Cakes are important | cookery |
| Reading | reading | Reading is important | literacy |
| Writing | writing | Writing is important | literacy |
And the following "core_competency > related_competencies" exist:
| competency | relatedcompetency |
| desserts | cakes |
And the following "core_competency > plans" exist:
| name | description | competencies | user |
| Cookery | Cookery is important | salads, desserts, cakes | student1 |
| Literacy | Literacy is important | reading, writing | student1 |
And the following "core_competency > course_competencies" exist:
| course | competency |
| C1 | salads |
| C1 | desserts |
| C1 | cakes |
| C1 | reading |
| C1 | writing |
And the following "core_competency > user_competency" exist:
| competency | user | grade |
| salads | student1 | Good |
| desserts | student1 | Great |
| cakes | student1 | Great |
And the following "core_competency > user_competency_courses" exist:
| course | competency | user | grade |
| C1 | salads | student1 | Good |
| C1 | desserts | student1 | Great |
| C1 | cakes | student1 | Great |
Scenario: Student view
# Course competencies
Given I am on the "C1" "tool_lp > course competencies" page logged in as "student1"
Then I should see "You are proficient in 3 out of 5 competencies in this course"
And "Salads are important" "tool_lp > competency description" should exist in the "Salads" "tool_lp > competency"
And "Good" "tool_lp > competency grade" should exist in the "Salads" "tool_lp > competency"
And "Desserts are important" "tool_lp > competency description" should exist in the "Desserts" "tool_lp > competency"
And "Great" "tool_lp > competency grade" should exist in the "Desserts" "tool_lp > competency"
And "Cakes are important" "tool_lp > competency description" should exist in the "Cakes" "tool_lp > competency"
And "Great" "tool_lp > competency grade" should exist in the "Cakes" "tool_lp > competency"
And "Reading is important" "tool_lp > competency description" should exist in the "Reading" "tool_lp > competency"
And "Good" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
And "Great" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
And "Bad" "tool_lp > competency grade" should not exist in the "Reading" "tool_lp > competency"
And "Writing is important" "tool_lp > competency description" should exist in the "Writing" "tool_lp > competency"
And "Good" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
And "Great" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
And "Bad" "tool_lp > competency grade" should not exist in the "Writing" "tool_lp > competency"
# Course competencies details
And I click on "Desserts" "link" in the "Desserts" "tool_lp > competency"
And I should see "Desserts are important"
And "Yes" "tool_lp > competency page proficiency" should exist
And "Great" "tool_lp > competency page rating" should exist
# Course competencies summary
And I click on "Cakes" "link"
And I should see "Cakes are important"
# Learning plans
And I click on "Close" "button" in the "Cakes" "dialogue"
And I follow "Profile" in the user menu
And I click on "Learning plans" "link"
And I should see "Cookery"
And I should see "Literacy"
# Learning plans details
And I click on "Cookery" "link"
And I should see "Cookery is important"
And I should see "3 out of 3 competencies are proficient"
And "Good" "tool_lp > learning plan rating" should exist in the "Salads" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Salads" "tool_lp > learning plan"
And "Great" "tool_lp > learning plan rating" should exist in the "Desserts" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Desserts" "tool_lp > learning plan"
And "Great" "tool_lp > learning plan rating" should exist in the "Cakes" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Cakes" "tool_lp > learning plan"
And I should not see "Literacy"
And I should not see "Reading"
And I should not see "Writing"
# Learning plans competency details
And I click on "Desserts" "link" in the "Desserts" "tool_lp > learning plan"
And I should see "Desserts are important"
And "Yes" "tool_lp > competency page proficiency" should exist
And "Great" "tool_lp > competency page rating" should exist
# Learning plans competency summary
And I click on "Cakes cakes" "link"
And I should see "Cakes are important"
Scenario: Teacher view
# Participant competencies
Given I am on the "C1" "report_competency > breakdown" page logged in as "teacher1"
Then I should see "Student first"
And "Good" "report_competency > breakdown rating" should exist in the "Salads" "report_competency > breakdown"
And "Great" "report_competency > breakdown rating" should exist in the "Desserts" "report_competency > breakdown"
And "Great" "report_competency > breakdown rating" should exist in the "Cakes" "report_competency > breakdown"
And "Not rated" "report_competency > breakdown rating" should exist in the "Reading" "report_competency > breakdown"
And "Not rated" "report_competency > breakdown rating" should exist in the "Writing" "report_competency > breakdown"
# Participant competencies details
And I click on "Great" "report_competency > breakdown rating" in the "Desserts" "report_competency > breakdown"
And "Yes" "tool_lp > competency page proficiency" should exist
And "Great" "tool_lp > competency page rating" should exist
# Participant competencies summary
And I click on "Cakes" "tool_lp > competency page related competency"
And I should see "Cakes are important"
# Participant learning plans
And I click on "Close" "button" in the "Cakes" "dialogue"
And I click on "Close" "button" in the "User competency summary" "dialogue"
And I navigate to course participants
And I click on "Student first" "link"
And I click on "Learning plans" "link"
And I should see "Cookery"
And I should see "Literacy"
# Participant learning plans details
And I click on "Cookery" "link"
And I should see "Cookery is important"
And I should see "3 out of 3 competencies are proficient"
And "Good" "tool_lp > learning plan rating" should exist in the "Salads" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Salads" "tool_lp > learning plan"
And "Great" "tool_lp > learning plan rating" should exist in the "Desserts" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Desserts" "tool_lp > learning plan"
And "Great" "tool_lp > learning plan rating" should exist in the "Cakes" "tool_lp > learning plan"
And "Yes" "tool_lp > learning plan proficiency" should exist in the "Cakes" "tool_lp > learning plan"
And I should not see "Literacy"
And I should not see "Reading"
And I should not see "Writing"
# Learning plans competency details
And I click on "Desserts" "link"
And I should see "Desserts are important"
And "Yes" "tool_lp > competency page proficiency" should exist
And "Great" "tool_lp > competency page rating" should exist
# Learning plans competency summary
And I click on "Cakes" "tool_lp > competency page related competency"
And I should see "Cakes are important"
+2 -1
View File
@@ -27,7 +27,8 @@ require_once($CFG->libdir . '/externallib.php');
$userid = required_param('userid', PARAM_INT); // The user id the key belongs to (for double-checking).
$key = required_param('key', PARAM_ALPHANUMEXT); // The key generated by the tool_mobile_external::get_autologin_key() external function.
$urltogo = optional_param('urltogo', $CFG->wwwroot, PARAM_URL); // URL to redirect.
$urltogo = optional_param('urltogo', $CFG->wwwroot, PARAM_LOCALURL); // URL to redirect.
$urltogo = $urltogo ?: $CFG->wwwroot;
$context = context_system::instance();
$PAGE->set_context($context);
+1
View File
@@ -504,6 +504,7 @@ class api {
'NoDelegate_H5POffline' => new lang_string('h5poffline', 'tool_mobile'),
'NoDelegate_DarkMode' => new lang_string('darkmode', 'tool_mobile'),
'CoreFilterDelegate' => new lang_string('type_filter_plural', 'plugin'),
'CoreReportBuilderDelegate' => new lang_string('reportbuilder', 'core_reportbuilder'),
),
"$mainmenu" => array(
'$mmSideMenuDelegate_mmaFrontpage' => new lang_string('sitehome'),
+3
View File
@@ -51,5 +51,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
+3
View File
@@ -45,5 +45,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for event observers.
*
* @package tool_monitor
* @category test
* @copyright 2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_monitor;
defined('MOODLE_INTERNAL') || die();
@@ -30,11 +23,14 @@ require_once($CFG->dirroot . '/blog/locallib.php');
require_once($CFG->dirroot . '/blog/lib.php');
/**
* Class tool_monitor_eventobservers_testcase
* Unit tests for event observers.
*
* Tests for event observers
* @package tool_monitor
* @category test
* @copyright 2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_monitor_eventobservers_testcase extends advanced_testcase {
class eventobservers_test extends \advanced_testcase {
/**
* Set up method.
*/
@@ -57,12 +53,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$course2 = $this->getDataGenerator()->create_course();
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = $course1->id;
$rule->plugin = 'test';
$sub = new stdClass();
$sub = new \stdClass();
$sub->courseid = $course1->id;
$sub->userid = $user->id;
@@ -83,7 +79,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
}
// Add a site rule.
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = 0;
$rule->plugin = 'core';
@@ -135,7 +131,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
// Fire a bunch of events.
// Trigger a bunch of other events.
$eventparams = array(
'context' => context_course::instance($course->id)
'context' => \context_course::instance($course->id)
);
for ($i = 0; $i < 5; $i++) {
\core\event\course_viewed::create($eventparams)->trigger();
@@ -148,14 +144,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$this->assertEquals(0, $DB->count_records('tool_monitor_events'));
// Now, let's create a rule so an event can be stored.
$rule = new stdClass();
$rule = new \stdClass();
$rule->courseid = $course->id;
$rule->plugin = 'mod_book';
$rule->eventname = '\mod_book\event\course_module_instance_list_viewed';
$rule = $monitorgenerator->create_rule($rule);
// Let's subscribe to this rule.
$sub = new stdClass;
$sub = new \stdClass;
$sub->courseid = $course->id;
$sub->ruleid = $rule->id;
$sub->userid = $user->id;
@@ -187,14 +183,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$DB->delete_records('tool_monitor_events');
// Now, let's create a site wide rule.
$rule = new stdClass();
$rule = new \stdClass();
$rule->courseid = 0;
$rule->plugin = 'mod_book';
$rule->eventname = '\mod_book\event\course_module_instance_list_viewed';
$rule = $monitorgenerator->create_rule($rule);
// Let's subscribe to this rule.
$sub = new stdClass;
$sub = new \stdClass;
$sub->courseid = 0;
$sub->ruleid = $rule->id;
$sub->userid = $user->id;
@@ -231,14 +227,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$course = $this->getDataGenerator()->create_course();
$toolgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rulerecord = new stdClass();
$rulerecord = new \stdClass();
$rulerecord->courseid = $course->id;
$rulerecord->eventname = '\mod_book\event\course_module_instance_list_viewed';
$rulerecord->frequency = 1;
$rule = $toolgenerator->create_rule($rulerecord);
$subrecord = new stdClass();
$subrecord = new \stdClass();
$subrecord->courseid = $course->id;
$subrecord->ruleid = $rule->id;
$subrecord->userid = $USER->id;
@@ -279,7 +275,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$DB->delete_records('tool_monitor_events');
// Now let us create a rule specific to a module instance.
$cm = new stdClass();
$cm = new \stdClass();
$cm->course = $course->id;
$book = $this->getDataGenerator()->create_module('book', $cm);
$rulerecord->eventname = '\mod_book\event\course_module_viewed';
@@ -290,7 +286,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
// Let us trigger events.
$params = array(
'context' => context_module::instance($book->cmid),
'context' => \context_module::instance($book->cmid),
'objectid' => $book->id
);
for ($i = 0; $i < 5; $i++) {
@@ -337,10 +333,10 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$toolgenerator->create_subscription($subrecord);
// Let us trigger events.
$blog = new blog_entry();
$blog = new \blog_entry();
$blog->subject = "Subject of blog";
$blog->userid = $USER->id;
$states = blog_entry::get_applicable_publish_states();
$states = \blog_entry::get_applicable_publish_states();
$blog->publishstate = reset($states);
for ($i = 0; $i < 5; $i++) {
$newblog = fullclone($blog);
@@ -367,14 +363,14 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$course = $this->getDataGenerator()->create_course();
$toolgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rulerecord = new stdClass();
$rulerecord = new \stdClass();
$rulerecord->courseid = $course->id;
$rulerecord->eventname = '\mod_book\event\course_module_instance_list_viewed';
$rulerecord->frequency = 5;
$rule = $toolgenerator->create_rule($rulerecord);
$subrecord = new stdClass();
$subrecord = new \stdClass();
$subrecord->courseid = $course->id;
$subrecord->ruleid = $rule->id;
$subrecord->userid = $USER->id;
@@ -416,7 +412,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
*
* @param phpunit_message_sink $msgsink Message sink
*/
protected function verify_processed_data(phpunit_message_sink $msgsink) {
protected function verify_processed_data(\phpunit_message_sink $msgsink) {
global $DB, $USER;
$recordexists = $DB->count_records('task_adhoc', array('component' => 'tool_monitor'));
@@ -435,7 +431,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
*
* @param phpunit_message_sink $msgsink Message sink
*/
protected function verify_message_not_sent_yet(phpunit_message_sink $msgsink) {
protected function verify_message_not_sent_yet(\phpunit_message_sink $msgsink) {
$msgs = $msgsink->get_messages();
$this->assertCount(0, $msgs);
$msgsink->clear();
@@ -457,12 +453,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$context = \context_user::instance($USER->id, IGNORE_MISSING);
// Creating book.
$cm = new stdClass();
$cm = new \stdClass();
$cm->course = $course->id;
$book = $this->getDataGenerator()->create_module('book', $cm);
// Creating rule.
$rulerecord = new stdClass();
$rulerecord = new \stdClass();
$rulerecord->courseid = $course->id;
$rulerecord->eventname = '\mod_book\event\course_module_viewed';
$rulerecord->cmid = $book->cmid;
@@ -478,7 +474,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$rule = $toolgenerator->create_rule($rulerecord);
// Creating subscription.
$subrecord = new stdClass();
$subrecord = new \stdClass();
$subrecord->courseid = $course->id;
$subrecord->ruleid = $rule->id;
$subrecord->userid = $USER->id;
@@ -486,7 +482,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
// Now let us trigger the event.
$params = array(
'context' => context_module::instance($book->cmid),
'context' => \context_module::instance($book->cmid),
'objectid' => $book->id
);
@@ -496,7 +492,7 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$msgs = $msgsink->get_messages();
$msg = array_pop($msgs);
$modurl = new moodle_url('/mod/book/view.php', array('id' => $book->cmid));
$modurl = new \moodle_url('/mod/book/view.php', array('id' => $book->cmid));
$this->assertMatchesRegularExpression('~<h2>.*' . preg_quote($event->get_url()->out(), '~') . '.*</h2>~',
$msg->fullmessagehtml);
@@ -529,12 +525,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$course2 = $this->getDataGenerator()->create_course();
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = $course1->id;
$rule->plugin = 'test';
$sub = new stdClass();
$sub = new \stdClass();
$sub->courseid = $course1->id;
$sub->userid = $user->id;
@@ -585,16 +581,16 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
// Now let us create a rule specific to a module instance.
$cm = new stdClass();
$cm = new \stdClass();
$cm->course = $course1->id;
$book = $this->getDataGenerator()->create_module('book', $cm);
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = $course1->id;
$rule->plugin = 'test';
$sub = new stdClass();
$sub = new \stdClass();
$sub->courseid = $course1->id;
$sub->userid = $user->id;
$sub->cmid = $book->cmid;
+11 -19
View File
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_monitor;
/**
* Unit tests for rule manager api.
*
@@ -22,17 +24,7 @@
* @copyright 2014 onwards Simey Lameze <simey@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
/**
* Tests for rule manager.
*
* Class tool_monitor_rule_manager_testcase
*/
class tool_monitor_rule_manager_testcase extends advanced_testcase {
class rule_manager_test extends \advanced_testcase {
/**
* Set up method.
@@ -53,7 +45,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$course = $this->getDataGenerator()->create_course();
$now = time();
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = $course->id;
$rule->name = 'test rule 1';
@@ -98,7 +90,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rule = $monitorgenerator->create_rule();
$ruledata = new stdClass;
$ruledata = new \stdClass;
$ruledata->id = $rule->id;
$ruledata->frequency = 25;
@@ -119,10 +111,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$record = new stdClass();
$record = new \stdClass();
$record->courseid = $course1->id;
$record2 = new stdClass();
$record2 = new \stdClass();
$record2->courseid = $course2->id;
$ruleids = array();
@@ -147,10 +139,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$record = new stdClass();
$record = new \stdClass();
$record->plugin = 'core';
$record2 = new stdClass();
$record2 = new \stdClass();
$record2->plugin = 'mod_assign';
$ruleids = array();
@@ -175,10 +167,10 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$rule = $monitorgenerator->create_rule();
$record = new stdClass();
$record = new \stdClass();
$record->eventname = '\core\event\calendar_event_created';
$record2 = new stdClass();
$record2 = new \stdClass();
$record2->eventname = '\core\event\calendar_event_updated';
$ruleids = array();
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_monitor;
/**
* Unit tests for subscription manager api.
*
@@ -22,17 +24,7 @@
* @copyright 2014 onwards Simey Lameze <simey@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
/**
* Tests for subscription manager.
*
* Class tool_monitor_subscription_manager_testcase.
*/
class tool_monitor_subscription_manager_testcase extends advanced_testcase {
class subscription_manager_test extends \advanced_testcase {
/**
* Test count_rule_subscriptions method.
@@ -56,7 +48,7 @@ class tool_monitor_subscription_manager_testcase extends advanced_testcase {
$this->assertEquals(0, $subs);
// Subscribe user 1 to rule 1.
$record = new stdClass;
$record = new \stdClass;
$record->ruleid = $rule1->id;
$record->userid = $user1->id;
$monitorgenerator->create_subscription($record);
@@ -75,4 +67,4 @@ class tool_monitor_subscription_manager_testcase extends advanced_testcase {
$this->assertEquals(2, $subs1);
$this->assertEquals(1, $subs2);
}
}
}
@@ -13,7 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
defined('MOODLE_INTERNAL') || exit();
namespace tool_monitor;
/**
* Unit tests for the subscription class.
@@ -24,7 +25,7 @@ defined('MOODLE_INTERNAL') || exit();
* @copyright 2016 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_monitor_subscription_testcase extends advanced_testcase {
class subscription_test extends \advanced_testcase {
/**
* @var \tool_monitor\subscription $subscription object.
@@ -38,7 +39,7 @@ class tool_monitor_subscription_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create the mock subscription.
$sub = new stdClass();
$sub = new \stdClass();
$sub->id = 100;
$sub->name = 'My test rule';
$sub->courseid = 20;
@@ -62,7 +63,7 @@ class tool_monitor_subscription_testcase extends advanced_testcase {
*/
public function test_magic_get() {
$this->assertEquals(20, $this->subscription->courseid);
$this->expectException(coding_exception::class);
$this->expectException(\coding_exception::class);
$this->subscription->ruleid;
}
}
@@ -13,7 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
defined('MOODLE_INTERNAL') || exit();
namespace tool_monitor;
/**
* Unit tests for the tool_monitor clean events task.
@@ -24,7 +25,7 @@ defined('MOODLE_INTERNAL') || exit();
* @copyright 2016 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
class task_check_subscriptions_test extends \advanced_testcase {
private $course;
private $user;
@@ -45,7 +46,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
$this->user = $this->getDataGenerator()->create_user();
$this->course = $this->getDataGenerator()->create_course();
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = 2; // Rule created by admin.
$rule->courseid = $this->course->id;
$rule->plugin = 'mod_book';
@@ -54,7 +55,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$this->rule = $monitorgenerator->create_rule($rule);
$sub = new stdClass();
$sub = new \stdClass();
$sub->courseid = $this->course->id;
$sub->userid = $this->user->id;
$sub->ruleid = $this->rule->id;
@@ -90,7 +91,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
public function test_site_level_subscription() {
// Create a site level subscription.
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
$sub = new stdClass();
$sub = new \stdClass();
$sub->userid = $this->user->id;
$sub->ruleid = $this->rule->id;
$this->subscription = $monitorgenerator->create_subscription($sub);
@@ -104,7 +105,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
$this->assertEquals(false, \tool_monitor\subscription_manager::subscription_is_active($this->subscription));
// Now, assign the user as a teacher role at system context.
$this->getDataGenerator()->role_assign($this->teacherrole->id, $this->user->id, context_system::instance());
$this->getDataGenerator()->role_assign($this->teacherrole->id, $this->user->id, \context_system::instance());
// Run the task.
$task = new \tool_monitor\task\check_subscriptions();
@@ -238,7 +239,7 @@ class tool_monitor_task_check_subscriptions_testcase extends advanced_testcase {
$book = $this->getDataGenerator()->create_module('book', array('course' => $this->course->id));
// And add a subscription to it.
$sub = new stdClass();
$sub = new \stdClass();
$sub->courseid = $this->course->id;
$sub->userid = $this->user->id;
$sub->ruleid = $this->rule->id;
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_monitor;
/**
* Unit tests for the tool_monitor clean events task.
*
@@ -22,15 +24,7 @@
* @copyright 2014 Mark Nelson <markn@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
/**
* Class used to test the tool_monitor clean events task.
*/
class tool_monitor_task_clean_events_testcase extends advanced_testcase {
class task_clean_events_test extends \advanced_testcase {
/**
* Test set up.
@@ -51,16 +45,16 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
$course = $this->getDataGenerator()->create_course();
$bookgenerator = $this->getDataGenerator()->get_plugin_generator('mod_book');
$book = $this->getDataGenerator()->create_module('book', array('course' => $course->id));
$bookcontext = context_module::instance($book->cmid);
$bookcontext = \context_module::instance($book->cmid);
$bookchapter = $bookgenerator->create_chapter(array('bookid' => $book->id));
$course2 = $this->getDataGenerator()->create_course();
$book2 = $this->getDataGenerator()->create_module('book', array('course' => $course2->id));
$book2context = context_module::instance($book2->cmid);
$book2context = \context_module::instance($book2->cmid);
$book2chapter = $bookgenerator->create_chapter(array('bookid' => $book2->id));
$monitorgenerator = $this->getDataGenerator()->get_plugin_generator('tool_monitor');
// Let's set some data for the rules we need before we can generate them.
$rule = new stdClass();
$rule = new \stdClass();
$rule->userid = $user->id;
$rule->courseid = $course->id;
$rule->plugin = 'mod_book';
@@ -96,7 +90,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
// Let's subscribe to these rules.
$sub = new stdClass;
$sub = new \stdClass;
$sub->courseid = $course->id;
$sub->ruleid = $rule1->id;
$sub->userid = $user->id;
@@ -133,7 +127,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
// Trigger a bunch of other events.
$eventparams = array(
'context' => context_course::instance($course->id)
'context' => \context_course::instance($course->id)
);
for ($i = 0; $i < 5; $i++) {
\mod_quiz\event\course_module_instance_list_viewed::create($eventparams)->trigger();
@@ -164,7 +158,7 @@ class tool_monitor_task_clean_events_testcase extends advanced_testcase {
$this->assertEquals($course2->id, $event4->courseid);
// Update the timewindow for two of the rules.
$updaterule = new stdClass();
$updaterule = new \stdClass();
$updaterule->id = $rule1->id;
$updaterule->timewindow = 0;
\tool_monitor\rule_manager::update_rule($updaterule);
+3 -18
View File
@@ -105,24 +105,6 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2021052501) {
// Find out if there are users with MoodleNet profiles set.
$sql = "SELECT u.*
FROM {user} u
WHERE u.moodlenetprofile IS NOT NULL";
$records = $DB->get_records_sql($sql);
foreach ($records as $record) {
// Force clean user value just incase there is something malicious.
$record->moodlenetprofile = clean_text($record->moodlenetprofile, PARAM_NOTAGS);
$DB->update_record('user', $record);
}
upgrade_plugin_savepoint(true, 2021052501, 'tool', 'moodlenet');
}
if ($oldversion < 2022021600) {
// This is a special case for if MoodleNet integration has never been enabled,
// or if defaultmoodlenet is not set for whatever reason.
@@ -164,5 +146,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
upgrade_plugin_savepoint(true, 2022021601, 'tool', 'moodlenet');
}
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
@@ -58,9 +58,8 @@ $string['mnetprofiledesc'] = '<p>Enter your MoodleNet profile details here to be
$string['moodlenetsettings'] = 'MoodleNet settings';
$string['moodlenetnotenabled'] = 'The MoodleNet integration must be enabled in Site administration / MoodleNet before resource imports can be processed.';
$string['notification'] = 'You are about to import the content "{$a->name} ({$a->type})" into your site. Select the course in which it should be added, or <a href="{$a->cancellink}">cancel</a>.';
$string['removedmnetprofilenotification'] = '<p>Due to some recent changes on the MoodleNet platform, users that have previously saved their MoodleNet profile on the site can no longer use this data to authenticate on the MoodleNet platform. The related data has now been removed as it is no longer useful.</p>
<p>The users will need to reset this information on the site by linking their MoodleNet profile ID which can be found on their MoodleNet profile.</p>';
$string['removedmnetprofilenotification_subject'] = 'Linked MoodleNet profiles removed.';
$string['removedmnetprofilenotification'] = 'Due to recent changes on the MoodleNet platform, any users who previously saved their MoodleNet profile ID on the site will need to enter a MoodleNet profile ID in the new format in order to authenticate on the MoodleNet platform.';
$string['removedmnetprofilenotification_subject'] = 'MoodleNet profile ID format change';
$string['searchcourses'] = "Search courses";
$string['selectpagetitle'] = 'Select page';
$string['pluginname'] = 'MoodleNet';
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_moodlenet;
/**
* Unit tests for the import_backup_helper
*
@@ -22,15 +24,7 @@
* @copyright 2020 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
/**
* Class import_backup_helper tests
*/
class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
class import_backup_helper_test extends \advanced_testcase {
/**
* Test that the first available context with the capability to upload backup files is returned.
@@ -47,7 +41,7 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
$user5 = $this->getDataGenerator()->create_user();
$course = $this->getDataGenerator()->create_course();
$coursecontext = context_course::instance($course->id);
$coursecontext = \context_course::instance($course->id);
$this->getDataGenerator()->enrol_user($user1->id, $course->id, 'student');
$this->getDataGenerator()->enrol_user($user2->id, $course->id, 'editingteacher');
@@ -55,12 +49,12 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
$category = $this->getDataGenerator()->create_category();
$rolerecord = $DB->get_record('role', ['shortname' => 'manager']);
$categorycontext = context_coursecat::instance($category->id);
$categorycontext = \context_coursecat::instance($category->id);
$this->getDataGenerator()->role_assign($rolerecord->id, $user3->id, $categorycontext->id);
$this->getDataGenerator()->role_assign($rolerecord->id, $user5->id, $categorycontext->id);
$roleid = $this->getDataGenerator()->create_role();
$sitecontext = context_system::instance();
$sitecontext = \context_system::instance();
assign_capability('moodle/restore:uploadfile', CAP_ALLOW, $roleid, $sitecontext->id, true);
accesslib_clear_all_caches_for_unit_testing();
$this->getDataGenerator()->role_assign($roleid, $user4->id, $sitecontext->id);
@@ -81,4 +75,4 @@ class tool_moodlenet_import_backup_helper_testcase extends advanced_testcase {
$this->assertEquals(CONTEXT_COURSECAT, $result->contextlevel);
}
}
}
@@ -14,24 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the import_handler_info class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
namespace tool_moodlenet\local;
use tool_moodlenet\local\import_handler_info;
use tool_moodlenet\local\import_strategy;
use tool_moodlenet\local\import_strategy_file;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_import_handler_info_testcase, providing test cases for the import_handler_info class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class import_handler_info_test extends \advanced_testcase {
@@ -14,15 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the import_handler_registry class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
namespace tool_moodlenet\local;
use tool_moodlenet\local\import_handler_registry;
use tool_moodlenet\local\import_handler_info;
@@ -31,10 +23,13 @@ use tool_moodlenet\local\import_strategy_link;
use tool_moodlenet\local\remote_resource;
use tool_moodlenet\local\url;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_import_handler_registry_testcase, providing test cases for the import_handler_registry class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class import_handler_registry_test extends \advanced_testcase {
@@ -14,24 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the import_info class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
namespace tool_moodlenet\local;
use tool_moodlenet\local\import_info;
use tool_moodlenet\local\remote_resource;
use tool_moodlenet\local\url;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_import_info_testcase, providing test cases for the import_info class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class import_info_test extends \advanced_testcase {
@@ -14,15 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the import_processor class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
namespace tool_moodlenet\local;
use tool_moodlenet\local\import_handler_registry;
use tool_moodlenet\local\import_processor;
@@ -31,10 +23,13 @@ use tool_moodlenet\local\import_strategy_link;
use tool_moodlenet\local\remote_resource;
use tool_moodlenet\local\url;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_import_processor_testcase, providing test cases for the import_processor class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class import_processor_test extends \advanced_testcase {
@@ -14,24 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_moodlenet\local;
use tool_moodlenet\local\remote_resource;
use tool_moodlenet\local\url;
/**
* Unit tests for the remote_resource class.
* Class tool_moodlenet_remote_resource_testcase, providing test cases for the remote_resource class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
use tool_moodlenet\local\remote_resource;
use tool_moodlenet\local\url;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_remote_resource_testcase, providing test cases for the remote_resource class.
*/
class remote_resource_test extends \advanced_testcase {
/**
@@ -14,23 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_moodlenet\local;
use tool_moodlenet\local\url;
/**
* Unit tests for the url class.
* Class tool_moodlenet_url_testcase, providing test cases for the url class.
*
* @package tool_moodlenet
* @category test
* @copyright 2020 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tool_moodlenet\local\tests;
use tool_moodlenet\local\url;
defined('MOODLE_INTERNAL') || die();
/**
* Class tool_moodlenet_url_testcase, providing test cases for the url class.
*/
class url_test extends \advanced_testcase {
/**
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tool_moodlenet;
/**
* Unit tests for the profile manager
*
@@ -22,15 +24,7 @@
* @copyright 2020 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
/**
* Class profile_manager tests
*/
class tool_moodlenet_profile_manager_testcase extends advanced_testcase {
class profile_manager_test extends \advanced_testcase {
/**
* Test that on this site we use the user table to hold moodle net profile information.
@@ -57,7 +51,7 @@ class tool_moodlenet_profile_manager_testcase extends advanced_testcase {
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->expectException(moodle_exception::class);
$this->expectException(\moodle_exception::class);
$this->expectExceptionMessage(get_string('invalidmoodlenetprofile', 'tool_moodlenet'));
$result = new \tool_moodlenet\moodlenet_user_profile("", $user->id);
}
@@ -135,7 +135,6 @@ Feature: Basic OAuth2 functionality
And I set the following fields to these values:
| Name | Testing service modified |
And I press "Save changes"
And I should see "Could not discover service endpoints"
And I should see "Testing service modified"
And I click on "Delete" "link" in the "Testing service modified" "table_row"
And I should see "Are you sure you want to delete the identity issuer \"Testing service modified\"?"
@@ -240,13 +239,12 @@ Feature: Basic OAuth2 functionality
And I press "Save changes"
And "Do not allow login" "icon" should exist in the "Valid custom" "table_row"
And "Allow services" "icon" should exist in the "Valid custom" "table_row"
And "Service discovery successful" "icon" should exist in the "Valid custom" "table_row"
And I should see "-" in the "Valid custom" "table_row"
And I click on "Edit" "link" in the "Valid custom service" "table_row"
And I set the following fields to these values:
| Name | Invalid custom service |
| Service base URL | https://dc.imsglobal.org/ |
And I press "Save changes"
Then I should see "Could not discover end points for identity issuer: Invalid custom service"
And I should see "-" in the "Invalid custom service" "table_row"
And I click on "Delete" "link" in the "Invalid custom service" "table_row"
And I should see "Are you sure you want to delete the identity issuer \"Invalid custom service\"?"
@@ -282,13 +280,12 @@ Feature: Basic OAuth2 functionality
And I press "Save changes"
And "Do not allow login" "icon" should exist in the "Valid custom" "table_row"
And "Allow services" "icon" should exist in the "Valid custom" "table_row"
And "Service discovery successful" "icon" should exist in the "Valid custom" "table_row"
And I should see "-" in the "Valid custom" "table_row"
And I click on "Edit" "link" in the "Valid custom service" "table_row"
And I set the following fields to these values:
| Name | Invalid custom service |
| Service base URL | https://dc.imsglobal.org/ |
And I press "Save changes"
Then I should see "Could not discover end points for identity issuer: Invalid custom service"
And I should see "-" in the "Invalid custom service" "table_row"
And I click on "Edit" "link" in the "Invalid custom service" "table_row"
And I set the following fields to these values:
@@ -352,9 +349,12 @@ Feature: Basic OAuth2 functionality
And I should see "Custom display name" in the "Empty custom service" "table_row"
And "Not configured" "icon" should exist in the "Empty custom service" "table_row"
And "Do not allow services" "icon" should exist in the "Empty custom service" "table_row"
And I click on "Edit" "link" in the "Empty custom service" "table_row"
And I click on "Configure endpoints" "link" in the "Empty custom service" "table_row"
And I press "Create new endpoint for issuer \"Empty custom service\""
And I set the following fields to these values:
| Service base URL | https://accounts.google.com |
| Name | userinfo_endpoint |
| URL | https://example.com/userinfo |
And I press "Save changes"
And I navigate to "Server > OAuth 2 services" in site administration
And "Allow login" "icon" should exist in the "Empty custom service" "table_row"
And "Do not allow services" "icon" should exist in the "Empty custom service" "table_row"
+3
View File
@@ -46,5 +46,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 294 B

+1 -1
View File
@@ -56,5 +56,5 @@
d="m 10.60981,13.748496 q -0.42076,-0.2046 -0.42076,-0.6595 v -2.1834 H 0.36389001 q -0.15919999,0 -0.26154001,-0.102297 Q 0,10.700897 0,10.541796 V 2.5361969 q 0,-0.2388 0.20469002,-0.3297 0.22743999,-0.091 0.39800999,0.045 L 2.7860701,4.0708971 q 0.1250916,0.1024 0.1250916,0.2842998 v 3.639 H 10.18905 V 5.810797 q 0,-0.4548999 0.42076,-0.6596001 0.42075,-0.1932998 0.77327,0.1024 L 15.749821,8.892496 Q 16,9.0971966 16,9.4496973 16,9.8022974 15.749821,10.006998 l -4.366741,3.638798 q -0.36389,0.307 -0.77327,0.102297 z"
id="path4552"
inkscape:connector-curvature="0"
style="fill:#999999;fill-opacity:1;stroke-width:0.9999997" />
style="fill:#888;fill-opacity:1;stroke-width:0.9999997" />
</svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Some files were not shown because too many files have changed in this diff Show More