95248 Commits

Author SHA1 Message Date
Jun Pataleta
8b2b47f733 Merge branch 'MDL-66694-master' of git://github.com/junpataleta/moodle 2019-10-17 22:48:16 +08:00
Jun Pataleta
10cc5e8100 MDL-66694 mod_forum: Fix unit test
* Set $forum1's displaywordcount to true in
  test_mod_forum_get_discussion_posts() so that the word and char counts
  will be returned.
* Use count_words() and count_letters() instead of hard coding the
  expected values for the word and char counts.
2019-10-17 22:39:36 +08:00
Michael Hawkins
97aeba56ba MDL-66694 mod_forum: Refactored post counts scheduled task 2019-10-17 17:07:05 +08:00
Michael Hawkins
d21d6baac6 MDL-66694 mod_forum: Word/char count tidy ups & add task config option
The chunk size used by the existing post word/char count calculation
ad-hoc task can now be set as a $CFG parameter. Also improved the way
the ad-hoc task is re-queued and tidied up some redundant code.
2019-10-17 16:13:23 +08:00
Michael Hawkins
3c36cdb150 MDL-66694 mod_forum: Updated adhoc task to requeue until completion
The adhoc task run during upgrade will now be requeued until no more
word/char counts require updating. Previously it was only run once,
so only the first 5000 posts would be updated.
2019-10-17 15:05:57 +08:00
David Monllaó
7d8f604b3c MDL-66694 mod_forum: Upgrade forum post word and char counts 2019-10-17 15:05:57 +08:00
Michael Hawkins
3eb0a82fef MDL-66694 mod_forum: Word & char count update consistency fixes
Charcount logic is now consistent with wordcount in the post exporter.
Counts update now called in forum_udpate_instance since it is updating
the data.
2019-10-17 15:05:57 +08:00
David Monllaó
591dd68790 MDL-66694 mod_forum: Update word & char counts on db save 2019-10-17 15:05:57 +08:00
Michael Hawkins
68f2d677ae MDL-66694 forumreport_summary: String update and method tidy up
Replaced 'Char' with full word 'Character' in the charcount string.
Also tidied up show_word_char_counts code and set to protected instead
of private.
2019-10-17 15:05:57 +08:00
David Monllaó
74f94dfc26 MDL-66694 mod_forum: Word count and char count columns 2019-10-17 15:05:57 +08:00
Andrew Nicols
bcce0270fe MDL-66496 mod_data: Fixes during integration 2019-10-17 12:20:54 +08:00
Andrew Nicols
a7139f7600 Merge branch 'MDL-66496-master' of git://github.com/tobiasreischmann/moodle 2019-10-17 11:05:34 +08:00
Jake Dallimore
7591d8c498 Merge branch 'MDL-66020-master' of git://github.com/marinaglancy/moodle 2019-10-16 08:37:07 +08:00
Eloy Lafuente (stronk7)
d1729ce196 Merge branch 'MDL-66790-master' of git://github.com/junpataleta/moodle 2019-10-16 00:55:48 +02:00
Eloy Lafuente (stronk7)
ab74c7ad56 Merge branch 'MDL-66705-master' of git://github.com/abgreeve/moodle 2019-10-16 00:52:52 +02:00
Eloy Lafuente (stronk7)
c77052fb2b on-demand release 3.8dev+ 2019-10-15 23:01:00 +02:00
Eloy Lafuente (stronk7)
df089ac562 NOBUG: Fixed SVG browser compatibility 2019-10-15 23:00:54 +02:00
Eloy Lafuente (stronk7)
e7fad4ac6a Merge branch 'MDL-66553-master-fix' of git://github.com/junpataleta/moodle 2019-10-15 16:42:15 +02:00
Jun Pataleta
0aa17f2631 MDL-66553 question: Behat fixes
1. Fix sortable key for the qname/idnumber/tags column
2. Fix the default sort
3. Fix Behat test for sorting by idnumber. Added ID numbers for both
question A and question C in order for us to get consistent sorting
across DBs.
2019-10-15 20:22:12 +08:00
Jun Pataleta
80d7651534 MDL-66790 quizreport: Prevent sorting for checkbox column 2019-10-15 17:25:16 +08:00
Jun Pataleta
c2e4e6d588 Merge branch 'MDL-66226-master-2' of https://github.com/snake/moodle 2019-10-15 11:56:05 +08:00
Adrian Greeve
56ad15fc06 MDL-66705 tool_uploaduser: Add an example csv file. 2019-10-15 10:56:29 +08:00
Jake Dallimore
164e879156 Merge branch 'MDL-66796' of git://github.com/timhunt/moodle 2019-10-15 10:52:45 +08:00
Jun Pataleta
d75eb57daa Merge branch 'MDL-66821' of https://github.com/timhunt/moodle 2019-10-15 07:35:36 +08:00
Andrew Nicols
f124a49259 Merge branch 'MDL-66335' of https://github.com/stronk7/moodle 2019-10-15 07:21:52 +08:00
Eloy Lafuente (stronk7)
c461c96d25 MDL-66335 behat: Avoid double processing the page type
resolve_page_instance_helper() already processes the type, returning
the correct context that should be processing the navigation URL.

With that extra call to parse_page_name() the 2nd call always returns
"core", ultimately leading to tons of behat failures because "core" is
not aware of those (plugin, quiz for now) pages typology.
2019-10-14 23:52:28 +02:00
Eloy Lafuente (stronk7)
82d71a5c83 Merge branch 'MDL-66335' of https://github.com/timhunt/moodle 2019-10-14 18:53:44 +02:00
Eloy Lafuente (stronk7)
1b8a7f86d5 Merge branch 'MDL-66559-master' of git://github.com/andrewnicols/moodle 2019-10-14 16:33:46 +02:00
Tim Hunt
468d7ead0a MDL-66796 question bank: fix more bugs with category editing 2019-10-14 15:29:53 +01:00
Tim Hunt
9c4f0fa746 MDL-66796 question bank: 0 is a valid question category idnumber 2019-10-14 14:33:36 +01:00
Sara Arjona
5b91deed2c Merge branch 'MDL-63349-Master' of github.com:tuanngocnguyen/moodle 2019-10-14 13:58:09 +02:00
Tim Hunt
9c14b28d0b MDL-66821 question behat: new step for acting on questions in the bank
There is a proposed change MDL-66816 which will change the question
bank UI. This will break any Behat tests which uses low-level steps
like

    When I click on "Duplicate" "link" in the "Test question" "table_row"

to perform an action on a question in the question bank. This commit
introduces a new step:

    When I choose "Duplicate" action for "Test question" in the question bank

This commit also converts all core Behat tests to use the new step.
2019-10-14 11:36:12 +01:00
Sara Arjona
ef2f26b8b1 Merge branch 'MDL-66836-master' of https://github.com/sammarshallou/moodle 2019-10-14 12:26:49 +02:00
Tim Hunt
4e1ebf8cde MDL-66335 quiz behat: using the new generic navigation steps
This converts all the navigation to quiz pages when that is not
the thing under test. Also, I decided that the Quiz settings form
belonged to the course, so did not do that here.
2019-10-14 11:21:22 +01:00
Tim Hunt
9bcc357107 MDL-66335 behat: new step to log in and go straight to a particular page
I did not think thought through if this new URL parameter would be a
potential security hole. The simple cop-out option is to make it only
work on Behat sites for now.
2019-10-14 11:21:22 +01:00
Tim Hunt
4024556b98 MDL-66335 behat: generic step for navigating direct to specific pages 2019-10-14 11:19:13 +01:00
Eloy Lafuente (stronk7)
25494613f4 Merge branch 'MDL-66304' of https://github.com/golenkovm/moodle 2019-10-14 10:53:24 +02:00
Eloy Lafuente (stronk7)
70d33bc399 Merge branch 'MDL-66874-master' of git://github.com/junpataleta/moodle 2019-10-14 10:05:27 +02:00
Jake Dallimore
050f048e26 Merge branch 'MDL-66659' of https://github.com/paulholden/moodle 2019-10-14 15:33:10 +08:00
Andrew Nicols
e99a3cca93 MDL-66559 behat: Register component selectors earlier 2019-10-14 14:24:05 +08:00
Andrew Nicols
cd5382b298 MDL-66559 behat: Update running suite 2019-10-14 14:17:47 +08:00
Jun Pataleta
8da83f6c51 Merge branch 'MDL-66796-master-fix' of https://github.com/snake/moodle 2019-10-14 13:48:34 +08:00
Jake Dallimore
f79a974435 MDL-66796 mod_quiz: only update the id number if changed
If the idnumber is present in the DB, it's set to null. In this case,
don't update the value.
2019-10-14 13:38:20 +08:00
Jun Pataleta
5a85b7fc13 MDL-66874 mod_feedback: Use correct option attribute 'classes' 2019-10-14 11:27:19 +08:00
Jun Pataleta
4f71255e61 MDL-66874 mod_data: Explicitly add btn-secondary class to select all
* Plus use correct option attribute 'classes' for the slave
  checkboxes
2019-10-14 11:27:19 +08:00
Jun Pataleta
bc003428bc MDL-66874 mod_choice: Explicitly add btn-secondary class to select all 2019-10-14 11:27:19 +08:00
Jun Pataleta
0b0527cced MDL-66874 core: Allow master button checkbox toggle to be customisable
* Plus, add labelclasses data for template context in master and slave
checkbox templates.
2019-10-14 11:26:47 +08:00
Jake Dallimore
e7ac8db8a1 Merge branch 'MDL-66768-master' of git://github.com/rezaies/moodle 2019-10-14 11:21:03 +08:00
Jake Dallimore
7f518ce451 Merge branch 'MDL-66559-master' of git://github.com/andrewnicols/moodle 2019-10-14 11:09:44 +08:00
Shamim Rezaie
bf2e1bec4e MDL-66768 forumreport_summary: remove the select column when downloading 2019-10-14 13:07:17 +11:00