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

Merge branch 'MDL-74887-MOODLE_400_STABLE' of https://github.com/sh-csg/moodle into MOODLE_400_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2022-10-14 00:29:24 +08:00
parent 38c8f8be7d c9bd3a20b6
commit 6d805b7774
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/moodleform_mod.php
+5 -1
View File
@@ -213,6 +213,7 @@ abstract class moodleform_mod extends moodleform {
$this->_features->showdescription = plugin_supports('mod', $this->_modname, FEATURE_SHOW_DESCRIPTION, false);
$this->_features->gradecat = ($this->_features->outcomes or $this->_features->hasgrades);
$this->_features->advancedgrading = plugin_supports('mod', $this->_modname, FEATURE_ADVANCED_GRADING, false);
$this->_features->hasnoview = plugin_supports('mod', $this->_modname, FEATURE_NO_VIEW_LINK, false);
$this->_features->canrescale = (component_callback_exists('mod_' . $this->_modname, 'rescale_activity_grades') !== false);
}
@@ -613,7 +614,10 @@ abstract class moodleform_mod extends moodleform {
$mform->addElement('header', 'modstandardelshdr', get_string('modstandardels', 'form'));
$section = get_fast_modinfo($COURSE)->get_section_info($this->_section);
$allowstealth = !empty($CFG->allowstealth) && $this->courseformat->allow_stealth_module_visibility($this->_cm, $section);
$allowstealth =
!empty($CFG->allowstealth) &&
$this->courseformat->allow_stealth_module_visibility($this->_cm, $section) &&
!$this->_features->hasnoview;
if ($allowstealth && $section->visible) {
$modvisiblelabel = 'modvisiblewithstealth';
} else if ($section->visible) {
mod/label/db/upgrade.php
+14 -1
View File
@@ -45,7 +45,7 @@
defined('MOODLE_INTERNAL') || die;
function xmldb_label_upgrade($oldversion) {
global $CFG;
global $CFG, $DB;
// Automatically generated Moodle v3.6.0 release upgrade line.
// Put any upgrade step following this.
@@ -62,5 +62,18 @@ function xmldb_label_upgrade($oldversion) {
// Automatically generated Moodle v4.0.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2022041901) {
$module = $DB->get_field('modules', 'id', ['name' => 'label']);
$DB->execute('
UPDATE {course_modules}
SET visible = 0, visibleoncoursepage = 1
WHERE module = :module
AND visible = 1
AND visibleoncoursepage = 0',
['module' => $module]
);
upgrade_mod_savepoint(true, 2022041901, 'label');
}
return true;
}
mod/label/version.php
+1 -1
View File
@@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2022041900; // The current module version (Date: YYYYMMDDXX).
$plugin->version = 2022041901; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2022041200; // Requires this Moodle version.
$plugin->component = 'mod_label'; // Full name of the plugin (used for diagnostics)
$plugin->cron = 0;