Permalink
Browse files

Merge branch 'master' into install_master

  • Loading branch information...
2 parents 635bf2f + b69ec28 commit 88d4c218e9af99a37853fd51dedb2d8bc4f47878 AMOS bot committed Sep 6, 2013
Showing with 5,719 additions and 1,649 deletions.
  1. +3 −1 admin/renderer.php
  2. +3 −1 admin/repository.php
  3. +5 −8 admin/roles/classes/define_role_table_advanced.php
  4. +3 −3 admin/tool/behat/renderer.php
  5. +2 −2 admin/tool/behat/tests/behat/basic_actions.feature
  6. +28 −442 admin/tool/generator/classes/backend.php
  7. +507 −0 admin/tool/generator/classes/course_backend.php
  8. +3 −3 admin/tool/generator/classes/make_form.php
  9. +203 −0 admin/tool/generator/classes/site_backend.php
  10. +6 −3 admin/tool/generator/cli/maketestcourse.php
  11. +95 −0 admin/tool/generator/cli/maketestsite.php
  12. +15 −8 admin/tool/generator/lang/en/tool_generator.php
  13. +1 −1 admin/tool/generator/maketestcourse.php
  14. +45 −1 admin/tool/generator/tests/maketestcourse_test.php
  15. +2 −2 admin/tool/generator/version.php
  16. +2 −2 admin/tool/langimport/lang/en/tool_langimport.php
  17. +1 −1 admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
  18. +4 −9 admin/tool/uploaduser/index.php
  19. +28 −14 admin/tool/xmldb/lang/en/tool_xmldb.php
  20. +4 −9 admin/user.php
  21. +2 −2 auth/db/auth.php
  22. +3 −5 auth/email/auth.php
  23. +26 −27 auth/ldap/auth.php
  24. +2 −2 auth/mnet/auth.php
  25. +13 −5 backup/backup.php
  26. +28 −0 backup/controller/backup_controller.class.php
  27. +28 −0 backup/controller/restore_controller.class.php
  28. +20 −1 backup/import.php
  29. +5 −0 backup/moodle2/backup_final_task.class.php
  30. +18 −10 backup/restore.php
  31. +23 −2 backup/util/dbops/backup_controller_dbops.class.php
  32. +3 −0 backup/util/includes/backup_includes.php
  33. +3 −0 backup/util/includes/restore_includes.php
  34. +10 −0 backup/util/plan/backup_plan.class.php
  35. +21 −0 backup/util/plan/base_plan.class.php
  36. +33 −0 backup/util/plan/base_task.class.php
  37. +10 −0 backup/util/plan/restore_plan.class.php
  38. +4 −0 backup/util/plan/tests/fixtures/plan_fixtures.php
  39. +136 −0 backup/util/progress/core_backup_display_progress.class.php
  40. +28 −0 backup/util/progress/core_backup_null_progress.class.php
  41. +307 −0 backup/util/progress/core_backup_progress.class.php
  42. +363 −0 backup/util/progress/tests/progress_test.php
  43. +13 −15 backup/util/ui/restore_ui_components.php
  44. +4 −3 backup/util/ui/tests/behat/backup_courses.feature
  45. +33 −1 badges/classes/observer.php
  46. +48 −3 badges/external.php
  47. +3 −0 badges/mybackpack.php
  48. +85 −14 badges/renderer.php
  49. +19 −0 badges/tests/badgeslib_test.php
  50. +2 −2 blocks/course_list/lang/en/block_course_list.php
  51. +17 −17 blocks/navigation/tests/behat/view_my_courses.feature
  52. +12 −6 calendar/lib.php
  53. +1 −1 calendar/managesubscriptions.php
  54. +4 −2 calendar/renderer.php
  55. +2 −2 course/externallib.php
  56. +4 −4 course/lib.php
  57. +6 −6 course/tests/behat/course_controls.feature
  58. +17 −0 course/tests/courselib_test.php
  59. +1 −0 enrol/ldap/lang/en/enrol_ldap.php
  60. +6 −0 enrol/ldap/lib.php
  61. +11 −1 enrol/manual/locallib.php
  62. +210 −0 enrol/meta/classes/observer.php
  63. +21 −37 enrol/meta/db/events.php
  64. +0 −174 enrol/meta/locallib.php
  65. +108 −0 enrol/meta/tests/plugin_test.php
  66. +37 −0 enrol/tests/enrollib_test.php
  67. +1 −1 error/index.php
  68. +5 −5 files/renderer.php
  69. +1 −1 grade/export/lib.php
  70. +181 −6 grade/externallib.php
  71. +25 −0 grade/grading/form/guide/lib.php
  72. +40 −1 grade/grading/form/lib.php
  73. +23 −0 grade/grading/form/rubric/lib.php
  74. +138 −13 grade/tests/externallib_test.php
  75. +8 −8 lang/en/admin.php
  76. +7 −1 lang/en/badges.php
  77. +1 −0 lang/en/cache.php
  78. +1 −1 lang/en/completion.php
  79. +3 −0 lang/en/enrol.php
  80. +4 −3 lang/en/error.php
  81. +1 −1 lang/en/install.php
  82. +1 −1 lang/en/mathslib.php
  83. +5 −0 lang/en/moodle.php
  84. +1 −1 lang/en/repository.php
  85. +34 −6 lib/accesslib.php
  86. +14 −35 lib/badgeslib.php
  87. +6 −14 lib/behat/behat_base.php
  88. +0 −28 lib/behat/classes/behat_command.php
  89. +161 −0 lib/behat/classes/behat_selectors.php
  90. +3 −3 lib/behat/classes/util.php
  91. +1 −1 lib/blocklib.php
  92. +4 −1 lib/classes/component.php
  93. +1 −1 lib/classes/event/course_completed.php
  94. +1 −1 lib/classes/event/course_completion_updated.php
  95. +1 −1 lib/classes/event/course_module_completion_updated.php
  96. +99 −0 lib/classes/event/user_created.php
  97. +105 −0 lib/classes/event/user_deleted.php
  98. +109 −0 lib/classes/event/user_enrolment_created.php
  99. +110 −0 lib/classes/event/user_enrolment_deleted.php
  100. +109 −0 lib/classes/event/user_enrolment_updated.php
  101. +100 −0 lib/classes/event/user_loggedout.php
  102. +99 −0 lib/classes/event/user_updated.php
  103. +3 −0 lib/configonlylib.php
  104. +50 −2 lib/coursecatlib.php
  105. +6 −0 lib/db/caches.php
  106. +4 −8 lib/db/events.php
  107. +18 −2 lib/db/services.php
  108. +1 −0 lib/dml/mssql_native_moodle_database.php
  109. +1 −0 lib/dml/sqlsrv_native_moodle_database.php
  110. +7 −0 lib/editor/tinymce/module.js
  111. +36 −28 lib/enrollib.php
  112. +5 −3 lib/ldaplib.php
  113. +3 −2 lib/modinfolib.php
  114. +41 −28 lib/moodlelib.php
  115. +5 −2 lib/navigationlib.php
  116. +34 −12 lib/outputcomponents.php
  117. +10 −0 lib/outputrenderers.php
  118. +6 −0 lib/tests/behat/behat_hooks.php
  119. +1 −0 lib/tests/component_test.php
  120. +1 −1 lib/tests/configonlylib_test.php
  121. +55 −0 lib/tests/modinfolib_test.php
  122. +48 −3 lib/tests/moodlelib_test.php
  123. +3 −0 lib/upgrade.txt
  124. +53 −34 lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
  125. +1 −1 lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
  126. +53 −34 lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
  127. +53 −34 lib/yui/src/notification/js/dialogue.js
  128. +1 −1 login/change_password.php
  129. +17 −6 message/index.php
  130. +6 −3 message/lib.php
  131. +2 −0 message/send_form.php
  132. +2 −1 message/tests/behat/manage_contacts.feature
  133. +2 −1 message/tests/behat/search_history.feature
  134. +4 −0 mod/assign/backup/moodle2/restore_assign_stepslib.php
  135. +1 −1 mod/assign/classes/event/all_submissions_downloaded.php
  136. +1 −1 mod/assign/classes/event/assessable_submitted.php
  137. +1 −1 mod/assign/classes/event/extension_granted.php
  138. +1 −1 mod/assign/classes/event/identities_revealed.php
  139. +1 −1 mod/assign/classes/event/marker_updated.php
  140. +1 −1 mod/assign/classes/event/statement_accepted.php
  141. +1 −1 mod/assign/classes/event/submission_duplicated.php
  142. +1 −1 mod/assign/classes/event/submission_graded.php
  143. +1 −1 mod/assign/classes/event/submission_locked.php
  144. +1 −1 mod/assign/classes/event/submission_status_updated.php
  145. +1 −1 mod/assign/classes/event/submission_unlocked.php
  146. +1 −1 mod/assign/classes/event/submission_updated.php
  147. +1 −1 mod/assign/classes/event/workflow_state_updated.php
  148. +4 −3 mod/assign/locallib.php
  149. +8 −1 mod/assignment/backup/moodle1/lib.php
  150. +20 −0 mod/assignment/backup/moodle2/restore_assignment_stepslib.php
  151. +1 −0 mod/assignment/lang/en/assignment.php
  152. +6 −1 mod/assignment/lib.php
  153. +6 −2 mod/assignment/mod_form.php
  154. +2 −2 mod/assignment/type/online/classes/event/assessable_uploaded.php
  155. +2 −2 mod/assignment/type/upload/classes/event/assessable_submitted.php
  156. +2 −2 mod/assignment/type/upload/classes/event/assessable_uploaded.php
  157. +5 −1 mod/assignment/view.php
  158. +10 −12 mod/data/view.php
  159. +1 −1 mod/feedback/lang/en/feedback.php
  160. +2 −2 mod/forum/classes/event/assessable_uploaded.php
  161. +52 −0 mod/forum/classes/observer.php
  162. +7 −5 mod/forum/db/events.php
  163. +6 −6 mod/forum/lang/en/forum.php
  164. +0 −22 mod/forum/lib.php
  165. +3 −3 mod/forum/tests/behat/track_read_posts.feature
  166. +33 −0 mod/forum/tests/lib_test.php
  167. +1 −1 mod/lesson/lang/en/lesson.php
  168. +1 −1 mod/lti/lang/en/lti.php
  169. +1 −0 mod/scorm/lang/en/scorm.php
  170. +35 −24 mod/scorm/lib.php
  171. +3 −0 mod/scorm/locallib.php
  172. +114 −103 mod/scorm/mod_form.php
  173. +31 −13 mod/scorm/tests/validatepackage_test.php
  174. +2 −2 mod/workshop/classes/event/assessable_uploaded.php
  175. +1 −25 portfolio/googledocs/db/upgrade.php
  176. +53 −0 portfolio/googledocs/db/upgradelib.php
  177. +1 −25 portfolio/picasa/db/upgrade.php
  178. +53 −0 portfolio/picasa/db/upgradelib.php
  179. +1 −0 question/engine/lib.php
  180. +1 −1 report/security/lang/en/report_security.php
  181. +8 −3 repository/coursefiles/lib.php
  182. +4 −2 repository/filepicker.js
  183. +184 −1 repository/filesystem/lib.php
  184. +1 −25 repository/googledocs/db/upgrade.php
  185. +53 −0 repository/googledocs/db/upgradelib.php
  186. +3 −21 repository/lib.php
  187. +1 −25 repository/picasa/db/upgrade.php
  188. +53 −0 repository/picasa/db/upgradelib.php
  189. +0 −30 repository/repository_ajax.php
  190. +5 −2 repository/tests/behat/behat_filepicker.php
  191. +1 −0 repository/upgrade.txt
  192. +16 −0 theme/base/style/core.css
  193. +55 −0 theme/bootstrapbase/less/moodle/backup-restore.less
  194. +5 −0 theme/bootstrapbase/less/moodle/core.less
  195. +2 −2 theme/bootstrapbase/style/moodle.css
  196. +7 −9 user/edit.php
  197. +6 −19 user/editadvanced.php
  198. +4 −4 user/emailupdate.php
  199. +44 −35 user/lib.php
  200. +1 −2 user/messageselect.php
  201. +1 −1 user/profile/field/menu/lang/en/profilefield_menu.php
  202. +132 −0 user/tests/userlib_test.php
  203. +5 −1 user/view.php
  204. +2 −2 version.php
View
@@ -1011,9 +1011,11 @@ protected function required_column(plugininfo_base $plugin, plugin_manager $plug
} else {
$str = 'otherplugin';
}
+ $componenturl = new moodle_url('https://moodle.org/plugins/view.php?plugin='.$component);
+ $componenturl = html_writer::tag('a', $component, array('href' => $componenturl->out()));
$requires[] = html_writer::tag('li',
get_string($str, 'core_plugin',
- array('component' => $component, 'version' => $requiredversion)),
+ array('component' => $componenturl, 'version' => $requiredversion)),
array('class' => $class));
}
View
@@ -143,8 +143,10 @@ function repository_action_url($repository) {
$success = $repositorytype->update_options($settings);
} else {
$type = new repository_type($plugin, (array)$fromform, $visible);
- $type->create();
$success = true;
+ if (!$repoid = $type->create()) {
+ $success = false;
+ }
$data = data_submitted();
}
if ($success) {
@@ -49,14 +49,11 @@ public function __construct($context, $roleid) {
$this->displaypermissions = $this->allpermissions;
$this->strperms[$this->allpermissions[CAP_INHERIT]] = get_string('notset', 'core_role');
- $this->allcontextlevels = array(
- CONTEXT_SYSTEM => get_string('coresystem'),
- CONTEXT_USER => get_string('user'),
- CONTEXT_COURSECAT => get_string('category'),
- CONTEXT_COURSE => get_string('course'),
- CONTEXT_MODULE => get_string('activitymodule'),
- CONTEXT_BLOCK => get_string('block')
- );
+ $this->allcontextlevels = array();
+ $levels = context_helper::get_all_levels();
+ foreach ($levels as $level => $classname) {
+ $this->allcontextlevels[$level] = context_helper::get_level_name($level);
+ }
}
protected function load_current_permissions() {
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
-require_once($CFG->libdir . '/behat/classes/behat_command.php');
+require_once($CFG->libdir . '/behat/classes/behat_selectors.php');
/**
* Renderer for behat tool web features
@@ -92,15 +92,15 @@ public function render_stepsdefinitions($stepsdefinitions, $form) {
// Replace text selector type arguments with a user-friendly select.
$stepsdefinitions = preg_replace_callback('/(TEXT_SELECTOR\d?_STRING)/',
function ($matches) {
- return html_writer::select(behat_command::$allowedtextselectors, uniqid());
+ return html_writer::select(behat_selectors::get_allowed_text_selectors(), uniqid());
},
$stepsdefinitions
);
// Replace selector type arguments with a user-friendly select.
$stepsdefinitions = preg_replace_callback('/(SELECTOR\d?_STRING)/',
function ($matches) {
- return html_writer::select(behat_command::$allowedselectors, uniqid());
+ return html_writer::select(behat_selectors::get_allowed_selectors(), uniqid());
},
$stepsdefinitions
);
@@ -35,7 +35,7 @@ Feature: Page contents assertions
| Course 1 | C1 | 0 |
And I log in as "admin"
And I follow "Course 1"
- When I click on "Move this to the dock" "button" in the ".block_settings" "css_element"
+ When I click on "Move this to the dock" "button" in the "Administration" "block"
Then I should not see "Question bank"
And I click on "//div[@id='dock']/descendant::h2[normalize-space(.)='Administration']" "xpath_element"
@@ -45,5 +45,5 @@ Feature: Page contents assertions
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
- When I click on "Move this to the dock" "button" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' block_settings ')]" "xpath_element"
+ When I click on "Move this to the dock" "button" in the "Administration" "block"
Then I should not see "Turn editing on"
Oops, something went wrong.

0 comments on commit 88d4c21

Please sign in to comment.