Commit graph

21303 commits

Author SHA1 Message Date
Simey Lameze
dccf9ca308 MDL-50705 core_user: introduce new fill_properties_cache()
Also the get_property_definition() was created to get the property without retrieve the whole definition cache and
    unit tests were created to tests those new methods.
2016-03-10 13:17:08 +01:00
David Monllao
fb0b522035 Merge branch 'MDL-27628-master' of git://github.com/damyon/moodle 2016-03-10 13:17:07 +01:00
David Monllao
b8bc9037f1 Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle 2016-03-09 15:35:16 +08:00
David Monllao
11bad2b099 Merge branch 'MDL-51324-master' of git://github.com/damyon/moodle 2016-03-09 14:20:18 +08:00
Nadav Kavalerchik
dffcf46f43 MDL-52252 Tags: Add tags to modules (Resources and Activities) 2016-03-09 14:19:47 +08:00
Andrew Nicols
d84a657dda MDL-53273 search: Whitespace fix 2016-03-09 14:14:33 +08:00
Andrew Nicols
02726a29cc Merge branch 'MDL-53273-master' of git://github.com/merrill-oakland/moodle 2016-03-09 14:11:17 +08:00
Damyon Wiese
6f326bd204 MDL-27628 enrol_meta: Use new multi-course selector
Allows adding multiple instances of the meta enrol plugin at once.

I had to add support to the autocomplete element for filling the field from behat
when it was not using tags. I also had to make the shortnames more easily searchable
and unique in the behat feature file.
2016-03-09 13:32:08 +08:00
Damyon Wiese
3e66b0fccd MDL-51324 coursecat: Add to search courses unit test
Cover new option "requiredcapabilities".
2016-03-09 13:30:28 +08:00
Damyon Wiese
91ab264cf5 MDL-51324 forms: fix autocomplete element double selection bug
Incorrect types were preventing the currently selected values from
being removed from the new values returned via ajax.

Also fix a selection bug with autocomplete+ajax+singleselect.
2016-03-09 13:30:27 +08:00
Damyon Wiese
235ef57a3d MDL-51324 forms: Add a new course selector
This is a squashed commit containing a number of changes:

This is an ajax driven course selector that has searching etc. It can select single, or multiple courses.
Make course selector accept a list of courses to exclude
courseselector - lookup coursename on setValue
Use the get_course_display_name_in_list function to generate the course names
Add a throttle to auto-complete to reduce spamming the server
Do a single query to fetch all the courses in the mform element when validation fails
Fix core course search function to return results when there are less than 2 chars in the query.
Handle setData with an empty array in new course selector
2016-03-09 13:30:18 +08:00
David Monllao
c17e0034a1 Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle 2016-03-09 10:55:18 +08:00
Andrew Nicols
bd2e5ef17d Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle 2016-03-09 10:06:47 +08:00
Andrew Nicols
f4b6081ebf Merge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle 2016-03-09 08:35:14 +08:00
Cameron Ball
fa8e27b32b MDL-52522 grades: Add rescale grades option for grade categories.
When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.
2016-03-08 16:26:44 +08:00
David Monllao
406151d8e2 Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle 2016-03-08 16:13:42 +08:00
David Monllao
36d6f2d0c9 Merge branch 'MDL-53247-master' of git://github.com/danpoltawski/moodle 2016-03-08 09:17:13 +08:00
Cameron Ball
1688564a6e MDL-52651 htmlpurifier: Append rel=noreferrer to links.
Thank you to Zachary Durber for originally working on this issue.
2016-03-08 02:05:55 +01:00
Andrew Nicols
889b92c1c0 Merge branch 'MDL-53291_ajax_fix' of https://github.com/BenKelada/moodle 2016-03-08 07:43:31 +08:00
Krista Koivisto
7b9fbb1cf4 MDL-52774 ajax: Require authentication when getting nav branch
When getting the navigation branch data through AJAX, require
login if forcelogin is set.
2016-03-08 00:39:45 +01:00
Eric Merrill
bf2235bb11 MDL-53325 search: Optimize Solr less often 2016-03-06 13:46:54 -05:00
Eric Merrill
08c21a1beb MDL-53273 search: Use unicode safe string truncation 2016-03-06 13:32:59 -05:00
Juan Leyva
0ca559a111 MDL-50032 webservice: Remove plugin functions from mobile service 2016-03-04 14:15:33 +01:00
Juan Leyva
186eba1b2e MDL-50032 webservice: Allow plugins to add functions into services 2016-03-04 13:39:53 +01:00
Dan Poltawski
2f1f2d0222 MDL-53247 adminlib: change ordering of global search setup helper
Now put 'enable global search' as last step, thanks to David for the
idea.
2016-03-03 16:51:30 +08:00
Andrew Nicols
4ffe7e5070 MDL-30811 output: Adjust ARIA role to alert
https://www.w3.org/TR/wai-aria-practices/#alert
2016-03-03 15:09:18 +08:00
Andrew Nicols
c1cb65d470 MDL-30811 javascript: alert JS should be in template
By moving the JS required for an alert to the JavaScript we make it
possible for themers to use frameworks other than bootstrap if they so
wish.
2016-03-03 15:09:17 +08:00
Andrew Nicols
11a67b211b MDL-30811 javascript: Lazily load core dependencies
To prevent possible race conditions, we lazily load the templates, and ajax
dependencies.
2016-03-03 14:47:07 +08:00
Ben Kelada
023d6a6756 MDL-53291 javascript: fix jquery ajax requests when data contains ??
jQuery ajax requests containing multiple '?' get replaced with a
string similar to jQuery152330039032_1231231, this is because it
is processing a stringified data object as jsonp and thinks its a url.
 workaround is to add contenttype
see https://github.com/jquery/jquery/issues/1799
2016-03-03 09:15:24 +11:00
Eloy Lafuente (stronk7)
5aac4a23e5 Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle 2016-03-02 16:36:03 +01:00
Dan Poltawski
852f32f7b3 Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle 2016-03-02 15:49:45 +08:00
Marina Glancy
d2de503c80 MDL-50887 antivirus: clamav is standard plugin, missing strings 2016-03-02 15:42:35 +08:00
Andrew Nicols
2f244f1cc6 MDL-30811 core: Initiate notifications on first use only 2016-03-02 13:30:09 +08:00
Eloy Lafuente (stronk7)
df190d18a1 MDL-52136 mod_forum: fix some out-of-sync stuff
Thanks CIs!
2016-03-02 05:42:29 +01:00
Eloy Lafuente (stronk7)
ce878562f3 Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle 2016-03-02 05:25:57 +01:00
Andrew Nicols
0b4bff8ca9 MDL-52136 core: Add support for quoting variables in mustache helpers
This is required for when helpers include json-encoded variables as arguments.
As an example, imagine a template with content:

{{# str }} somekey, someidentifier, { "fullname": "{{ fullname }}" } {{/ str }}

If the fullname variable were to include the double-quote character (e.g.
John "Trevor" Doe) because of the way in which mustache renders content, it
would become:

{{# str }} somekey, someidentifier, { "fullname": "John "Trevor" Doe" } {{/ str }}

This results in an invalid JSON structure.

To work around this issue, the quote characters in the passed variable
must be escaped:

{{# str }} somekey, someidentifier, { "fullname": "John \"Trevor\" Doe" } {{/ str }}

Unfortunately, Mustache provides no way of doing so natively.

With this function, we can quote the text as appropriate:

{{# str }} somekey, someidentifier, { "fullname": {{# quote }}{{ fullname }}{{/ quote }} } {{/ str }}

This also handles the case where the quoted content includes the Mustache
delimeter ({{ or }}).

For example:
fullname = 'John "}}Trevor{{" Doe'

Ordinarily this would be rendered as:
{{# str }} somekey, someidentifier, { "fullname": "John "}}Trevor{{" Doe" } {{/ str }}

This rendering is both a JSON error, and also a mustache syntax error because of the mustache delimeters.

The quote helper also escapes these by wrapping them in change delimeter
tags:

{{# str }} somekey, someidentifier, { "fullname": "John "{{=<% %>=}}}}<%={{ }}=%>Trevor{{=<% %>=}}{{{{=<% %>=}}" Doe" } {{/ str }}
2016-03-02 08:48:46 +08:00
Dan Poltawski
73911de50d MDL-50887 clam: upgrade step with wrong version 2016-03-01 21:37:56 +08:00
Rajesh Taneja
bdd4bed8b5 MDL-53300 core_grade: use currentgradetype if modgrade_type is not set
If mod has grades, then while upgrading
modgrade_type is disabled. This will not post
it with form and hence validation fails.
To avoid above problem, use ->currentgradetype
if modgrade_type is not set
2016-03-01 16:38:59 +08:00
Dan Poltawski
b8b7f33acd Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle 2016-03-01 14:56:58 +08:00
Dan Poltawski
2158e87492 Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle 2016-03-01 14:49:33 +08:00
Andrew Nicols
614173c7dc Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle 2016-03-01 13:41:35 +08:00
Dan Poltawski
792508cb7f Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle 2016-03-01 12:26:33 +08:00
Dan Poltawski
fd8e293030 Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle 2016-03-01 12:23:54 +08:00
Andrew Nicols
cf633c555e MDL-30811 form: Remove continue from test. 2016-03-01 12:11:10 +08:00
Andrew Nicols
05b0f579ca Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle 2016-03-01 11:48:16 +08:00
Eloy Lafuente (stronk7)
d9dfc410ad Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle 2016-03-01 01:59:31 +01:00
Ruslan Kabalin
324a45833a MDL-50887 tests: Increment number of plugins in core_component_testcase.
We have got one more core plugin now.
2016-02-29 09:31:30 +00:00
Ruslan Kabalin
71f74dd165 MDL-50887 antivirus_clamav: Add unit tests for scanner class.
We are using "stubbing" method to replace real component (clamav) control
points with doubles in order to avoid direct calls to clamav. For more
details, please refer to https://phpunit.de/manual/4.8/en/test-doubles.html

Notice, that while it is possible to use setExpectedException in the tests,
this does not seem play correctly with consecutive assertions in the same
test after exception is thrown (they seem omitted). Explicit try/catch
construction has been used in testing instead.

To run just this test, use:
vendor/bin/phpunit antivirus_clamav_scanner_testcase lib/antivirus/clamav/tests/scanner_test.php
2016-02-29 09:31:30 +00:00
Ruslan Kabalin
ae3ba48272 MDL-50887 antivirus: Add unit tests for manager class.
To run just this test, use:
vendor/bin/phpunit core_antivirus_testcase lib/tests/antivirus_test.php
2016-02-29 09:31:29 +00:00
Ruslan Kabalin
d08667a271 MDL-50887 antivirus_clamav: Access config properties using getter. 2016-02-29 09:31:29 +00:00