moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
88204 commits 37 branches 544 tags 1.3 GiB
Commit graph

1320 commits

Author SHA1 Message Date
Cameron Ball
919b5c95e6
MDL-58994 core_calendar: Coalesce event sort field 
There are situations where we need to sort events on a field called
"timesort", but sometimes it is not set. So we can fall back to
"timestart" in this case.
 2017-05-19 15:08:05 +08:00
Jun Pataleta
4eec39e2b2 MDL-58723 calendar: Better testing of forever recurring events 
* Change the start date of the parent event to the current date
  for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
  generate more than 100 event records.
 2017-05-16 14:39:53 +08:00
Marina Glancy
cd2c4b8548 MDL-58867 calendar: avoid fatal errors for non-module events 2017-05-10 14:26:14 +08:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release 
version = 2017051500 release version
requires= 2017050500 current rc1 version
 2017-05-09 02:58:28 +02:00
Dan Poltawski
3cc5abc163 Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle 2017-05-08 10:31:37 +01:00
Jun Pataleta
472cae12a6 Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle 2017-05-08 15:50:03 +08:00
Jun Pataleta
c3b1178d58 MDL-58810 calendar: Fix rrule_manager issues 
* Set the correct repeat ID for the recurring event
* Unset UUID for 'child' events of recurring events
 2017-05-08 09:49:13 +08:00
Jun Pataleta
bf57bde20d MDL-58810 calendar: Add coverage for UUID in recurring events 2017-05-08 09:33:47 +08:00
Marina Glancy
47a710177a MDL-58688 calendar: retrieve event module without db queries 2017-05-04 16:53:19 +08:00
Andrew Nicols
6628153eb3 Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle 2017-05-04 14:33:27 +08:00
Cameron Ball
eeb27f03bd
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation 
We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.
 2017-05-04 12:19:35 +08:00
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
Marina Glancy
5900513f75
MDL-58688 calendar: use modinfo to check module availability 2017-05-03 15:07:43 +08:00
Ryan Wyllie
405f8491e5 MDL-58518 calendar: ignore events from courses user not enrolled in 2017-05-02 02:53:25 +00:00
Jake Dallimore
434f31bc12 Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle 2017-05-01 12:14:42 +08:00
Cameron Ball
d0dc97bf3a
MDL-58575 core_calendar: Group override tests for same priority 
This patch adds tests for when group override events have the same
priority.
 2017-04-27 19:12:50 +08:00
Cameron Ball
4bd022ed0c
MDL-58575 core_calendar: Properly restrict groups in event vault 
Previously we were not filtering on groups in the event vault
which meant events for all groups would be returned regardless
of which user was passed in.

This resulted in situations where one student would group overrides
for groups they were not in.
 2017-04-27 15:23:53 +08:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00
Cameron Ball
a776415d55
MDL-58578 core_calendar: Properly respect priorities on overview 
Prior to this patch, if a user was in two groups, and an override
existed for both groups in an assignment the override
visually lower on the override list would be displayed on the
overview, whereas the one visually higher would be displayed
in the assignment grading table.
 2017-04-27 15:15:12 +08:00
David Monllao
f539dc3aa5 Merge branch 'MDL-58718-master' of git://github.com/andrewnicols/moodle 2017-04-27 11:14:04 +08:00
Eloy Lafuente (stronk7)
a25116c0ac MDL-58718 unit tests: fix some windows + 32bits problems 
- We were using number beyond 32 bits MAXINT.
- setTimestamp() needs an integer. Better fulfill it.
 2017-04-26 09:36:10 +08:00
Jake Dallimore
0dcfadd9e4 Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle 2017-04-24 15:16:30 +08:00
Mark Nelson
37c38dfca1 MDL-58566 calendar: fixed comment's reference to non-existent function 2017-04-21 11:27:15 +08:00
David Monllao
fc394ded2a Merge branch 'MDL-58566-master' of git://github.com/junpataleta/moodle 2017-04-19 00:43:02 +08:00
Jun Pataleta
6d5661a9b3 MDL-57793 calendar: Additional edge-case tests 
* Added leap year and 31th day of the month tests.
 2017-04-18 13:55:25 +08:00
Jun Pataleta
dbb49e8d48 MDL-57793 calendar: Add recursion to satisfy COUNT rule 
* Add recursion to the creation of recurring calendar events to satisfy
  the COUNT rule, if necessary.
 2017-04-18 13:55:25 +08:00
Jun Pataleta
22753c8c5c MDL-58566 calendar: Move \core_calendar\local\api::get_legacy_events() 
* Move and rename \core_calendar\local\api::get_legacy_events() to
  calendar_get_legacy_events() in calendar/lib.php.
* Fix the parameter-normalising callback function in
  calendar_get_legacy_events() so that it correctly handles false values
  by returning an empty array instead of it returning a non-empty array
  that contains an empty element.
 2017-04-18 10:32:09 +08:00
Cameron Ball
a05e4f25a7
MDL-58085 core_calendar: Display actions on calendar events page 2017-04-11 11:21:43 +08:00
Mark Nelson
5c85bfe122 MDL-55611 core_calendar: Fixed query for Oracle 
Also fixed unit test filter.
 2017-04-06 12:56:00 +08:00
Andrew Nicols
95f38c22ca MDL-55611 calendar: Fix unit test filter 
The event test factory uses a closure to return only every other record.
This was previously working based on ID but MSSQL starts from an even
number rather than an odd number.

This change changes that to use a static variable which keeps a count of
the records instead and only returns every other record in this fashion,
removing the dependance upon ID.
 2017-04-06 08:50:12 +08:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Simey Lameze
53cbac18ba MDL-58474 core_calendar: add missing action_event_interface import 
Part of MDL-55611 epic.
 2017-04-04 11:01:57 +01:00
Mark Nelson
d7bc2c6fd5 MDL-55611 core_calendar: fixed unit tests failing in isolation 2017-04-04 11:01:57 +01:00
Cameron Ball
c28f1077c4 MDL-58442 core_calendar: Better documentation for the container 
Part of MDL-55611 epic.
 2017-04-04 11:01:57 +01:00
Cameron Ball
92ac08bcee MDL-58442 core_calendar: Nuke action_event_factory and friends 
These are unecessary since the only place the factory
is used is in the container.

Part of MDL-55611 epic.
 2017-04-04 11:01:56 +01:00
Cameron Ball
d10693cb63 MDL-58442 core_calendar: Rename core_container to simply container 
core_container was confusing as it looks Frankenstyleish.

Part of MDL-55611 epic.
 2017-04-04 11:01:56 +01:00
Cameron Ball
42e76c3f70 MDL-58430 core_calendar: Keep interfaces with implementations 
All interfaces have been moved from the interfaces folder such
that they now live with their default implementations.

Part of MDL-55611 epic.
 2017-04-04 11:01:55 +01:00
Mark Nelson
2229368a3c MDL-58424 core_calendar: moved api::get_events 
This function was moved to local_api::get_legacy_events.

Also removed the calendar/classes/api.php file since it no longer contained any
functionality and added unit tests for local_api::get_legacy_events (a copy of
the unit tests for calendar_get_events).

Part of MDL-55611 epic.
 2017-04-04 11:01:53 +01:00
Mark Nelson
f8443a26f9 MDL-58424 core_calendar: removed unused get_action_events_* functions 
Also moved associated unit tests to another location and changed
them so that they were testing local_api instead.

Part of MDL-55611 epic.
 2017-04-04 11:01:53 +01:00
Mark Nelson
23a29de7ee MDL-58424 core_calendar: moved logic from api.php to lib.php 
Also moved related PHPUnit tests.

Part of MDL-55611 epic.
 2017-04-04 11:01:52 +01:00
Mark Nelson
10515e152d MDL-58424 core: undeprecated calendar_* functions 
Part of MDL-55611 epic.
 2017-04-04 11:01:52 +01:00
Jun Pataleta
c755cb354c MDL-58441 calendar: Pass $withduration to the correct function 
Part of MDL-55611 epic.
 2017-04-04 11:01:50 +01:00
Mark Nelson
2a8e41b990 MDL-58432 core_calendar: allow event properties to be null 
Part of MDL-55611 epic.
 2017-04-04 11:01:49 +01:00
Mark Nelson
e1cd93ce20 MDL-58423 core_calendar: moved \core_calendar\event class 
Part of MDL-55611 epic.
 2017-04-04 11:01:49 +01:00
Cameron Ball
71d1430c27 MDL-58396 core_calendar: Fix failing unit test 
Part of MDL-55611 epic.
 2017-04-04 11:01:48 +01:00
Jun Pataleta
20592f5ff2 MDL-58386 calendar: Fixed CI issues 
Part of MDL-55611 epic.
 2017-04-04 11:01:47 +01:00
Cameron Ball
8d4e0f29dc MDL-58383 core_calendar: Correctly filter in event vault 
The filter parameter was being passed in as the wrong argument which
was allowing non action events to be returned.

Part of MDL-55611 epic.
 2017-04-04 11:01:45 +01:00
Damyon Wiese
de66ac3cd6 MDL-55611 calendar: fix calendar_event uses 
It was renamed to \core_calendar::event
 2017-04-04 11:01:44 +01:00
Damyon Wiese
01a95b86cd MDL-55611 icons: Remove pix_url 
Change to image_url because these are not "pix icons".
 2017-04-04 11:01:44 +01:00
Cameron Ball
378259a8ab MDL-58087 core_calendar: Fix random unit test failure 
Part of MDL-55611 epic.
 2017-04-04 11:01:42 +01:00