mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity
89,795 Commits 36 Branches 519 Tags
Commit Graph

524 Commits

Author SHA1 Message Date
Simey Lameze
0f1e7ec906 MDL-60826 calendar: restrict course fields to be retrieved 2018-07-24 07:58:34 +08:00
Simey Lameze
375b15a346 MDL-60826 calendar: deprecate calendar_get_all_allowed_types 2018-07-24 07:58:34 +08:00
Simey Lameze
dfc609e55d MDL-60826 calendar: lazy load groups on event form 2018-07-24 07:58:34 +08:00
Simey Lameze
4be55b06da MDL-60826 calendar: introduce calendar_get_allowed_event_types function 2018-07-24 07:58:34 +08:00
Michael Hawkins
ef4e04ee26 MDL-37624 calendar: Added location support 2018-06-29 10:46:54 +08:00
Luca Bösch
0188d5b5b4 MDL-61956 calendar: allow to see hidden course with switch role 2018-05-02 09:37:32 +02:00
Martin Gauk
c4172077df MDL-61519 calendar: do not iterate through all categories 
Replace calls to \coursecat::get_all() or cache the results.
 2018-03-16 14:30:55 +00:00
Jun Pataleta
3894262a2f MDL-61152 calendar: Remove usage of undefined variable 2018-01-23 10:49:18 +08:00
David Monllao
abf089f2a3 Merge branch 'MDL-60967-master' of git://github.com/ryanwyllie/moodle 2018-01-16 12:36:27 +01:00
David Monllao
51673a3469 Merge branch 'wip-MDL-60742-master' of git://github.com/marinaglancy/moodle 2018-01-09 09:52:44 +01:00
Ryan Wyllie
60908b2187 MDL-60967 calendar: only load course filter when required 2018-01-09 05:57:38 +00:00
Marina Glancy
099bca6de6 MDL-60742 calendar: allow customisation of 12/24h time format strings 2018-01-04 15:16:08 +08:00
Jun Pataleta
60236650d6 Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle 2018-01-03 16:53:49 +08:00
Ryan Wyllie
08a7915551 MDL-60964 calendar: lazy load context for calendar_event 
Stop loading the context in the constructor if it hasn't been provided.
There is no need to load it by default. We should lazily load it when it
is required.
 2017-12-13 03:20:00 +00:00
Ryan Wyllie
7884ecf24f MDL-60962 block_calendar_month: load content after page render 2017-12-06 06:21:16 +00:00
David Monllao
087b3303a5 Merge branch 'MDL-60842-master' of git://github.com/lameze/moodle 2017-11-20 10:27:58 +01:00
Simey Lameze
2dc93a3769 MDL-60842 calendar: do not load all course fields 2017-11-20 16:49:45 +08:00
Simey Lameze
5e8e87aaee MDL-60806 core_calendar: return hidden categories 2017-11-20 12:06:47 +08:00
Simey Lameze
10c17dcc10 MDL-60628 calendar: support category events on get_calendar_events ws 2017-11-09 11:29:07 +08:00
Andrew Nicols
f3743b3041 Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle 2017-11-06 12:43:24 +08:00
Damyon Wiese
30890c2971 MDL-60626 calendar: Fix for overrides 
Override events do not have the courseid so we need to get it from the module instance.
 2017-11-06 12:21:27 +08:00
Damyon Wiese
af25b8fc7f MDL-60626 calendar: Check capabilities for api 
All external functions must check all capabilities before returning data.
The calendar API itself does not check capabilities (I wish it did), so we must be
careful exposing these functions to webservices.
 2017-11-06 11:11:28 +08:00
Jake Dallimore
eb354bdefa Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle 2017-11-06 09:29:46 +08:00
Andrew Nicols
b9fd516407 MDL-60361 calendar: Support all event types for calendar subs 2017-11-03 11:27:40 +08:00
Andrew Nicols
57e8c9f748 MDL-60587 calendar: Correct category subscription in information 2017-11-02 21:49:28 +08:00
Andrew Nicols
7b7bf31d4c MDL-60587 calendar: Add helper to setup the calendar_information 2017-11-02 21:49:28 +08:00
Andrew Nicols
e3491a093a MDL-60558 calendar: Upcoming block should use the right template 2017-11-02 11:55:49 +08:00
Damyon Wiese
ed6d81c9f7 MDL-59973 calendar: Remove duplication 
The function calendar_get_default_courses is responsible for loading all variants of calendar
course lists.

1 the list of courses that the current user will see events for in the site calendar.
2 the list of courses the current user will see when they are looking at a specific course calendar.
3 the list of course calendars the current user can create / edit events in.
 2017-10-26 14:39:35 +08:00
Damyon Wiese
01ed53df0f MDL-59973 calendar: Only load required fields 
When loading courses for the course filter on the calendar, we only need the id and shortname.
 2017-10-26 14:21:29 +08:00
Damyon Wiese
a5327e449d MDL-59973 calendar: Admin calendar course lists 
Consolidate the logic for the list of courses an admin will see in the calendar.

They will see all courses if calendar_admincanseeall is enabled.

They will see only courses they are enrolled in of calendar_admincanseeall is not enabled.

They will also see the current course, if they are admin and it is not already in the list.

This applies to the course selector and the create and update event forms.

The calendar link in the navigation block has also been changed to link to the current course calendar instead of the global
one.
 2017-10-26 13:28:00 +08:00
Jake Dallimore
19fa690c3f MDL-60429 calendar: fix for updating event course and group 
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
 2017-10-25 12:45:54 +08:00
Jake Dallimore
e3a247849b Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle 2017-10-25 12:45:53 +08:00
Simey Lameze
6428642adb MDL-60429 calendar: update group and course id for repeated events 2017-10-24 13:46:40 +08:00
Andrew Nicols
349d379616 MDL-60561 calendar: Increase event limit for calendar 
It's quite common to have more than 50 events in a calendar month, but
we do not want to change the default value when the API is called in
other ways.
 2017-10-24 13:31:05 +08:00
David Monllao
50a5feff05 Merge branch 'MDL-60406-master' of git://github.com/lameze/moodle 2017-10-20 04:38:06 +02:00
Simey Lameze
5a11e7f5f3 MDL-60406 core_calendar: proper calendar dates calculation 2017-10-20 10:32:41 +08:00
David Monllao
f2732541e8 Merge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle 2017-10-19 15:41:56 +02:00
Simey Lameze
05187c589d MDL-60468 calendar: fix event type defaults logic 2017-10-18 15:41:05 +08:00
Andrew Nicols
4e84059e8f MDL-60444 calendar: Correct variable name 2017-10-16 10:19:14 +08:00
Simey Lameze
580a168a15 MDL-59921 calendar: fix wrong array assumptions 2017-10-11 16:26:51 +08:00
Jun Pataleta
1b3f3d5761 Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle 2017-10-11 15:58:46 +08:00
Andrew Nicols
a7ed05e720 MDL-60090 calendar: Add eventtype icon and truncate 2017-10-11 14:03:01 +08:00
Damyon Wiese
3f94d19060 Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle 2017-10-11 14:02:52 +08:00
Simey Lameze
ca14f182fc MDL-60092 calendar: add missing upcoming view logic 2017-10-11 11:42:41 +08:00
Damyon Wiese
32d641c009 Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle 2017-10-10 17:17:56 +08:00
Simey Lameze
4259387ebb MDL-60092 core_calendar: remove unused calendar_get_upcoming method 2017-10-10 13:55:35 +08:00
Simey Lameze
522b84be04 MDL-60092 block_calendar_upcoming: convert to template 2017-10-10 13:55:35 +08:00
Simey Lameze
86244e9102 MDL-59921 calendar: replace selector for groups events 2017-10-09 09:51:14 +08:00
Simey Lameze
4b9c662b2a MDL-59921 calendar: replace selector for course events 2017-10-09 09:51:14 +08:00
Andrew Nicols
3ea4f446bc MDL-60096 calendar: Add JS for day view 2017-10-05 16:54:47 +08:00