Commit Graph

1065 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 9515c34ee6 Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle 2013-02-26 09:46:13 +01:00
Adrian Greeve 3dd204b1e6 MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 10:21:37 +08:00
Eloy Lafuente (stronk7) ca1774aea4 Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle 2013-02-20 00:45:50 +01:00
Sam Hemelryk 79a809ba44 MDL-34298 course: fixed course search output validation issue 2013-02-19 11:03:58 +13:00
Marina Glancy 9ecb50e6e3 MDL-33774 instead of checking that activity is label we check that it has view url 2013-02-14 19:46:19 +11:00
Damyon Wiese 6904688967 Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle 2013-02-12 13:09:18 +08:00
Mark Nelson 9a9cb74118 MDL-37654 core_course: ensure exceptions return static error codes for debugging purposes 2013-02-06 12:10:10 +08:00
Dan Poltawski 9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Dan Poltawski 40a008b33c Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-02-04 11:29:22 +08:00
Marina Glancy 2c49fb4c3e MDL-37572 Course categories are now managed in /course/manage.php
Switching between categories view and edit no longer depend on global editing mode
/course/index.php and /course/category.php do not contain editing code
2013-02-01 08:51:34 +13:00
Paul Nicholls 606554d5b0 MDL-32652 - Make block drag-drop work throughout Moodle
The central "content" region on My Home / user profile pages also needs to
be initialised in lib/ajax/blocks.php in order to allow blocks to be
dropped into that region successfully.  Some tweaks were also necessary in
order to correct the "content" region's structure in order for drag-drop
to function on this region on these pages.

Non-standard block regions (including the central "content" region
used by My Home and user profile pages) were causing the temporary empty
block region used as a drop target to sometimes appear in the wrong place.

The call to init_requirements_data (which includes the block drag-drop JS)
happens at a late enough stage in page generation that we can simply
pass the context ID through to the JS, so that it can be sent as part of
the AJAX request.  This prevents lib/ajax/blocks.php from having to try
to guess the context from the other bits of information it receives, so
block drag-drop should now work everywhere without issues.
2013-01-29 14:57:28 +13:00
Sam Hemelryk 5126bab95c Merge branch 'MDL-36881-m' of git://github.com/andrewnicols/moodle 2013-01-29 08:52:01 +13:00
Sam Chaffee 56c0878b45 MDL-36881 Handle poorly behaved modname_get_types functions better
The modname_get_types function is not always well implemented by
third-party plugins and some return poor data. This in turn leads to
incorrect module definitions, and can lead to problems in both the
'Add an activity...' dropdowns and the Activity chooser.

This will also prevent display of plugins which legitimately can have
subtypes but where no subtypes were found. Since such plugins cannot be
used in this fashion in any case, this is also beneficial.

Signed-off-by: Andrew Robert Nicols <andrew.nicols@lancaster.ac.uk>
2013-01-28 10:21:22 +00:00
Sam Hemelryk 56a81ad856 Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle 2013-01-28 17:37:07 +13:00
Dan Poltawski dec70f2599 Revert "MDL-32652 - Make block drag-drop work throughout Moodle"
This reverts commit d7c29c2257.
2013-01-25 11:52:15 +08:00
Dan Poltawski 0a93b3127f Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle 2013-01-23 08:53:02 +08:00
Sam Hemelryk 8c35fcdcd9 Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-01-23 11:08:55 +13:00
Mark Nelson a347aee32e MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
2013-01-22 17:05:16 +08:00
Dan Poltawski 8cd57fb26a Merge branch 'MDL-37430-master' of github.com:damyon/moodle 2013-01-22 11:53:10 +08:00
Mary Evans eb610eb90d MDL-37612 course: changed 1 instance of generalbox class to generaltable class in each of the following category.php, lib.php, search.php 2013-01-21 23:12:20 +00:00
Dan Poltawski 94abbef12f Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-01-21 09:59:35 +08:00
Andrew Davis 40fcc26189 MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items 2013-01-21 09:33:02 +13:00
Marina Glancy cf003abc92 MDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols 2013-01-17 14:51:25 +13:00
Sam Hemelryk 11fbebb029 MDL-36035 course: fixed typo in function name 2013-01-17 09:15:26 +13:00
Marina Glancy a3f66bdeac MDL-36968 Move function print_recent_activity() to the block recent_activity 2013-01-16 16:13:04 +11:00
Sam Hemelryk ec16ef1f85 Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle 2013-01-16 11:03:39 +13:00
Sam Hemelryk 00ba185d52 Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7) dcb21e6cc1 Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle 2013-01-15 20:04:21 +01:00
Dan Poltawski fb8585521a Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle 2013-01-15 11:56:12 +08:00
Damyon Wiese a83dd077f8 MDL-37430 Course - Make modules created in hidden sections visible when section is made visible. 2013-01-15 11:16:07 +08:00
Paul Nicholls d7c29c2257 MDL-32652 - Make block drag-drop work throughout Moodle
Other than shifting the initialisation from course/lib.php to
lib/outputrequirementslib.php, some workarounds/tweaks were required
in order to make it work correctly on admin pages and My Home.
2013-01-15 14:55:31 +13:00
Marina Glancy ff233851a0 MDL-36967 Deprecate function print_overview() 2013-01-14 15:05:31 +11:00
Marina Glancy 9a36be7361 MDL-37085 Properly deprecated functions print_xxx() from course/lib.php
- get_print_section_cm_text()
- print_section_add_menus()
- print_section()
- make_editing_buttons()
2013-01-14 15:01:28 +11:00
Marina Glancy c58a25d6eb MDL-37085 Move print_section() to the course renderer
Added two functions in the renderer:
- core_course_renderer::course_section_cm_list()
- core_course_renderer::course_section_cm()
2013-01-14 15:01:27 +11:00
Marina Glancy ed513fad52 MDL-37085 partly moved code from print_section() to renderer
- added function core_course_renderer::course_section_cm_name()
- added function core_course_renderer::course_section_cm_text()
- added function core_course_renderer::course_section_cm_availability()
2013-01-14 15:01:26 +11:00
Marina Glancy 5c016ab30d MDL-37085 fixed mess with code overwriting cm_info properties
In case when groupmode is forced by the course we should take it from the
course and not overwrite cm_info::groupmode externally
2013-01-14 15:01:25 +11:00
Marina Glancy 7e29340f7c MDL-37085 Moved completion info box rendering code to renderer
Was part of function print_section(), now it is
new function core_course_renderer::course_section_cm_completion()
2013-01-14 15:01:24 +11:00
Marina Glancy 9a6aa5c17d MDL-37085 Substitute function print_section_add_menus() with core_course_renderer::course_section_add_cm_controls() 2013-01-14 15:01:23 +11:00
Marina Glancy 697ff99997 MDL-37085 Load modchooser only when needed 2013-01-14 15:01:23 +11:00
Marina Glancy 170793359a MDL-37085 get_module_metadata() now returns link as moodle_url instead of string 2013-01-14 15:01:22 +11:00
Marina Glancy f89c53f679 MDL-37085 Substitute get_print_section_cm_text() with cm_info functions 2013-01-14 15:01:21 +11:00
Marina Glancy f558b291c1 MDL-37085 separated logic and html in make_editing_buttons()
- added function course_get_cm_edit_actions()
- added function core_course_renderer::course_section_cm_edit_actions()
- removed completely presently not working moveup/movedown controls
- removed not working duplicate controls from front page
2013-01-14 15:01:20 +11:00
Marina Glancy 49aa038b4e MDL-37085 Minor UI and code improvements in print_section() 2013-01-14 15:01:19 +11:00
Jason Fowler b4a7ce9e71 MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course 2013-01-14 09:46:04 +08:00
Sam Hemelryk f1ac8520ae MDL-36035 course: renamed new functions and cleaned up docs 2013-01-11 15:03:49 +13:00
Brian King e226a86d76 MDL-36035 course: reduce database queries when calling print_whole_category_list
On a Moodle with 1252 course categories, this reduces the database
reads from 1313 to 62 for course/index.php
2013-01-11 15:03:32 +13:00
Frederic Massart 95d1d0373b MDL-34435 reports: Log category actions 2013-01-10 15:10:22 +08:00
Dan Poltawski 319d937602 Revert "Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle"
This reverts commit 8361f557a1,
2b9e957a27 and
fae51910bf
2013-01-10 11:17:33 +08:00
Eloy Lafuente (stronk7) 8361f557a1 Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
Conflicts:
	course/tests/courselib_test.php
2013-01-09 01:31:50 +01:00
Sam Hemelryk f44e7d0a77 Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
	user/view.php
2013-01-09 09:34:22 +13:00