90627 Commits

Author SHA1 Message Date
Andrew Nicols
78f6d5196d Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle 2018-10-18 15:48:47 +08:00
Jake Dallimore
68eaa3150e MDL-63658 core_favourites: properly define interface methods and cleanup
This gets rid of specific repo functions which were unused, and makes
sure the following methods are defined on the interface, implemented
and tested:
- exists_by($criteria)
- find_by($criteria)
- delete_by($crtieria)
Also, added missing tests for find_favourite() repo method.
2018-10-18 15:39:57 +08:00
Jun Pataleta
de632063af Merge branch 'MDL-63667-master-fix2' of git://github.com/damyon/moodle 2018-10-18 14:37:13 +08:00
Andrew Nicols
61e0f58ca3 MDL-63667 amd: Check for parent template recursion 2018-10-18 12:04:19 +08:00
Damyon Wiese
b51c5b929f MDL-63667 output: Fix for recursive templates
A template can include itself - e.g. by looping over the context children and rendering a tree.

Ensure this promise still resolves.

Example: admin/tool/lp/templates/competencies_tree.mustache.
2018-10-18 10:48:01 +08:00
Andrew Nicols
3212e7aaef Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle 2018-10-18 10:06:14 +08:00
Jake Dallimore
1f3c76f0ec MDL-63658 core_favourites: fix differences between install and upgrade 2018-10-18 09:40:07 +08:00
Andrew Nicols
2ac4ea89d9 Merge branch 'MDL-63658-master-2' of https://github.com/snake/moodle 2018-10-18 09:08:22 +08:00
Eloy Lafuente (stronk7)
4658eefa13 Merge branch 'MDL-63632-master' of git://github.com/andrewnicols/moodle 2018-10-18 02:38:57 +02:00
Jake Dallimore
8d9cd27b02 MDL-63658 core_favourites: let service object use get_component_names
This was using a helper, but now we have the function in core to achieve
the same thing, so use this instead.
2018-10-18 08:22:08 +08:00
Jake Dallimore
3a1ece149f MDL-63658 core: new method get_component_names() added to core 2018-10-18 08:22:07 +08:00
Jake Dallimore
b7a3ec6f8d MDL-63658 core_favourites: consolidate interfaces and rename
Let's worry about reuse of the crud code later, when that requirement
arises, so moved that into the ifavourite_repository interface, and then
renamed it favourite_repository_interface.
2018-10-18 08:22:07 +08:00
Jake Dallimore
0551ed3569 MDL-63658 core_favourites: rename user_favourites_service and services
Now: user_favourite_service (singular) and service_factory
2018-10-18 08:22:07 +08:00
Jake Dallimore
cb90b549b6 MDL-63658 core_favourites: singularise the repository class types
Instead of favourites_repository we now have favourite_repository,
which is more in line with other implementations of this pattern.
2018-10-18 08:22:07 +08:00
Jake Dallimore
cfaf86b059 MDL-63658 core_favourites: make favourite a first class object
This patch adds several things:
- favourite entity class under local/entity
- refactoring of repository and service to use the new class instead
of stdClass.
- update repository unit tests to use the object instead of stdClass.
- update service_test so that the mock repo requires the object for
the add operation.
- remove unnecessary constructor from favourites_repository class.
2018-10-18 08:22:07 +08:00
Jake Dallimore
8ffbe9c163 MDL-63658 core_favourites: adding paging support to the service layer 2018-10-18 08:22:07 +08:00
Jake Dallimore
ac9138db1c MDL-63658 core_favourites: implement privacy API for favourites 2018-10-18 08:22:06 +08:00
Jake Dallimore
4a02aae5f5 MDL-63658 core_favourites: namespace the repositories and services 2018-10-18 08:22:06 +08:00
Jake Dallimore
771051325b MDL-63658 core_favourites: add business logic aware service layer 2018-10-18 08:22:06 +08:00
Jake Dallimore
d4e98ee580 MDL-63658 core_favourites: add a user favourites repository 2018-10-18 08:22:06 +08:00
Jake Dallimore
1cb94eabb4 MDL-63658 core_favourites: add tables to the subsystem 2018-10-18 08:22:05 +08:00
Andrew Nicols
7148f47f56 MDL-63632 forum: Delete where not discussion author 2018-10-18 07:20:29 +08:00
Eloy Lafuente (stronk7)
0f943d26bf Merge branch 'MDL-63068_master' of https://github.com/aanabit/moodle 2018-10-18 00:39:45 +02:00
Eloy Lafuente (stronk7)
d2a2b9c45a Merge branch 'MDL-63523-master' of git://github.com/jleyva/moodle 2018-10-17 23:22:52 +02:00
David Monllao
32b01d2b02 Merge branch 'MDL-63214-master' of git://github.com/sarjona/moodle 2018-10-17 15:55:44 +02:00
David Monllao
a9bbbd7a50 Merge branch 'MDL-27520_master' of git://github.com/markn86/moodle 2018-10-17 15:42:55 +02:00
Sara Arjona
f7dfa9ba3e MDL-63214 message: Add privacy preferences to filter who can message
Add new messaging profile preferences to allow users to choose who
can message them:
- By default, users can select between 'My contacts only' and 'My
contacts and anyone in my courses'
- When $CFG->messagingallusers is enabled, a new option is displayed
also: 'Anyone on the site'. For users who have selected this option,
if $CFG->messagingallusers is disabled, the behaviour will be changed
to 'My contacts and anyone in my courses'
2018-10-17 11:52:57 +02:00
Sara Arjona
327914160f MDL-63214 message: Add setting to force enabling messagingallusers 2018-10-17 11:52:57 +02:00
Mark Nelson
464a9dc556 MDL-27520 assignfeedback_comments: is_feedback_modified considers files 2018-10-17 15:57:27 +08:00
Mark Nelson
ec8471c966 MDL-27520 core_grades: add methods to grade_object for feedback files 2018-10-17 15:57:27 +08:00
Mark Nelson
80b6fb7a79 MDL-27520 core_grades: make constant names clearer
Also using them in more locations.
2018-10-17 15:57:27 +08:00
Mark Nelson
b7a9b6f872 MDL-27520 assignfeedback_comments: updated privacy provider 2018-10-17 15:57:27 +08:00
Damyon Wiese
c98e9fbae1 MDL-27520 core: Rewrite pluginfile URLs 2018-10-17 15:57:26 +08:00
Jun Pataleta
077a1a2080 Merge branch 'MDL-63667-master' of git://github.com/damyon/moodle 2018-10-17 15:06:29 +08:00
Andrew Nicols
f2d9a66240 Merge branch 'MDL-63547_master' of git://github.com/markn86/moodle 2018-10-17 14:53:23 +08:00
Ryan Wyllie
0015f5b8f1 MDL-63667 javascript: fix failed to pre-fetch the template error 2018-10-17 13:49:25 +08:00
Damyon Wiese
dd882ba035 MDL-27520 backup: Backup for feedback files 2018-10-17 13:15:49 +08:00
Mark Nelson
95ed603361 MDL-27520 core_grades: create grade history filearea and copy files 2018-10-17 13:15:49 +08:00
Mark Nelson
0e732f5d33 MDL-27520 assignfeedback_comments: added backup/restore of files 2018-10-17 13:15:49 +08:00
Mark Nelson
3672775931 MDL-27520 assignfeedback_comments: copy files to feedback
This respects the setting 'Comment inline' where the content
of a submission is copied into the feedback form.
2018-10-17 13:15:49 +08:00
Mark Nelson
c9f6ca1142 MDL-27520 core: allow retrieval of files from grade files areas
Also added 'history' filearea for the history report where files
will be copied to if the site has enabled this feature.

We will also be storing files in the module context, not course,
so that check was removed.
2018-10-17 13:15:45 +08:00
Mark Nelson
60b67bbcf7 MDL-63547 core_message: web service can delete multiple conversations 2018-10-17 12:05:16 +08:00
Mark Nelson
26f39c8861 MDL-63547 core_message: added delete_conversation_by_id web service 2018-10-17 12:05:16 +08:00
Mark Nelson
fa024820f2 MDL-63547 core_message: deprecate delete_conversation web service 2018-10-17 12:05:16 +08:00
Mark Nelson
15663b0bec MDL-63547 core_message: can_delete_conversation expects a conversationid 2018-10-17 12:05:16 +08:00
Mark Nelson
263ad98436 MDL-63547 core_message: deprecated api::delete_conversation() 2018-10-17 12:05:16 +08:00
Mark Nelson
08cb8a34f9 MDL-63547 core_message: updated api::can_delete_message 2018-10-17 12:05:16 +08:00
Mark Nelson
14de10c463 MDL-63547 core_message: updated message_deleted event to support groups 2018-10-17 12:05:16 +08:00
Jake Dallimore
4fca5dabb2 MDL-63658 core_favourites: introduce the favourites subsystem to core 2018-10-17 10:16:18 +08:00
Eloy Lafuente (stronk7)
c2f1dbcf49 on-demand release 3.6dev+ 2018-10-16 16:20:23 +02:00