L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-44725 Availability: Replace groupmembersonly - core_availability (2)

Browse Source 
Remove groupmembersonly usage in the core_availability API, and change
the update code (used in backup) so that it considers groupmembersonly
when restoring old backups.
This commit is contained in:
sam marshall
2014-09-02 13:03:09 +01:00
parent 061e6b2864
commit 3d962d49cb
5 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
availability/classes/info.php
+7 -7
View File
@@ -403,19 +403,19 @@ abstract class info {
* Supported fields: availablefrom, availableuntil, showavailability
* (and groupingid for sections).
*
* If you enable $modgroupmembersonly, then it also supports the
* groupmembersonly field for modules. This is off by default because
* we are not yet moving the groupmembersonly option into this new API.
* It also supports the groupmembersonly field for modules. This part was
* optional in 2.7 but now always runs (because groupmembersonly has been
* removed).
*
* @param \stdClass $rec Object possibly containing legacy fields
* @param bool $section True if this is a section
* @param bool $modgroupmembersonly True if groupmembersonly is converted for mods
* @param bool $modgroupmembersonlyignored Ignored option, previously used
* @return string|null New availability value or null if none
*/
public static function convert_legacy_fields($rec, $section, $modgroupmembersonly = false) {
public static function convert_legacy_fields($rec, $section, $modgroupmembersonlyignored = false) {
// Do nothing if the fields are not set.
if (empty($rec->availablefrom) && empty($rec->availableuntil) &&
(!$modgroupmembersonly || empty($rec->groupmembersonly)) &&
(empty($rec->groupmembersonly)) &&
(!$section || empty($rec->groupingid))) {
return null;
}
@@ -426,7 +426,7 @@ abstract class info {
// Groupmembersonly condition (if enabled) for modules, groupingid for
// sections.
if (($modgroupmembersonly && !empty($rec->groupmembersonly)) ||
if (!empty($rec->groupmembersonly) ||
(!empty($rec->groupingid) && $section)) {
if (!empty($rec->groupingid)) {
$conditions[] = '{"type":"grouping"' .