mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68612 lib: Reverting filter/filterset default join types to match UI

Browse Source 
These had temporarily been set to ALL for consistency while the unified
filter remained in use. Now that is being replaced with the new UI, it
can be returned to its intended default.
This commit is contained in:
Michael Hawkins 2020-05-20 17:32:34 +08:00
parent d85315ee8c
commit 9e791ff7f5
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/table/classes/local/filter/filter.php
View File

@ -41,11 +41,8 @@ use Iterator;
*/
class filter implements Countable, Iterator, JsonSerializable {
/**
* @var in The default filter type (ALL)
* Note: This is for backwards compatibility with the old UI behaviour and will be set to JOINTYPE_ANY as part of MDL-68612.
*/
const JOINTYPE_DEFAULT = 2;
/** @var in The default filter type (ANY) */
const JOINTYPE_DEFAULT = 1;
/** @var int None of the following match */
const JOINTYPE_NONE = 0;

7
lib/table/classes/local/filter/filterset.php
View File

@ -40,11 +40,8 @@ use moodle_exception;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class filterset implements JsonSerializable {
/**
* @var in The default filter type (ALL)
* Note: This is for backwards compatibility with the old UI behaviour and will be set to JOINTYPE_ANY as part of MDL-68612.
*/
const JOINTYPE_DEFAULT = 2;
/** @var in The default filter type (ANY) */
const JOINTYPE_DEFAULT = 1;
/** @var int None of the following match */
const JOINTYPE_NONE = 0;