Permalink
Browse files

Merge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle…

… into MOODLE_23_STABLE
  • Loading branch information...
2 parents 3565867 + 276d113 commit fc282e4ab36f71efc92a99d4c63ec03ff04c5cd2 @damyon damyon committed May 6, 2013
View
@@ -335,7 +335,7 @@
$cm->groupmembersonly = $fromform->groupmembersonly;
$completion = new completion_info($course);
- if ($completion->is_enabled()) {
+ if ($completion->is_enabled() && !empty($fromform->completionunlocked)) {
// Update completion settings
$cm->completion = $fromform->completion;
$cm->completiongradeitemnumber = $fromform->completiongradeitemnumber;
@@ -303,8 +303,11 @@ function validation($data, $files) {
}
// Completion: Don't let them choose automatic completion without turning
- // on some conditions
- if (array_key_exists('completion', $data) && $data['completion']==COMPLETION_TRACKING_AUTOMATIC) {
+ // on some conditions. Ignore this check when completion settings are
+ // locked, as the options are then disabled.
+ if (array_key_exists('completion', $data) &&
+ $data['completion'] == COMPLETION_TRACKING_AUTOMATIC &&
+ !empty($data['completionunlocked'])) {
if (empty($data['completionview']) && empty($data['completionusegrade']) &&
!$this->completion_rule_enabled($data)) {
$errors['completion'] = get_string('badautocompletion', 'completion');
View
@@ -140,8 +140,10 @@ function get_data() {
return false;
}
// Set up completion section even if checkbox is not ticked
- if (empty($data->completionsection)) {
- $data->completionsection=0;
+ if (!empty($data->completionunlocked)) {
+ if (empty($data->completionsubmit)) {
+ $data->completionsubmit = 0;
+ }
}
return $data;
}
View
@@ -203,14 +203,13 @@ public function get_data() {
$data->page_after_submitformat = $data->page_after_submit_editor['format'];
$data->page_after_submit = $data->page_after_submit_editor['text'];
- // Turn off completion settings if the checkboxes aren't ticked
- $autocompletion = !empty($data->completion) AND
- $data->completion==COMPLETION_TRACKING_AUTOMATIC;
- if (empty($data->completion) || !$autocompletion) {
- $data->completionsubmit=0;
- }
- if (empty($data->completionsubmit)) {
- $data->completionsubmit=0;
+ if (!empty($data->completionunlocked)) {
+ // Turn off completion settings if the checkboxes aren't ticked
+ $autocompletion = !empty($data->completion) &&
+ $data->completion == COMPLETION_TRACKING_AUTOMATIC;
+ if (!$autocompletion || empty($data->completionsubmit)) {
+ $data->completionsubmit=0;
+ }
}
}
View
@@ -235,15 +235,17 @@ function get_data() {
return false;
}
// Turn off completion settings if the checkboxes aren't ticked
- $autocompletion = !empty($data->completion) && $data->completion==COMPLETION_TRACKING_AUTOMATIC;
- if (empty($data->completiondiscussionsenabled) || !$autocompletion) {
- $data->completiondiscussions = 0;
- }
- if (empty($data->completionrepliesenabled) || !$autocompletion) {
- $data->completionreplies = 0;
- }
- if (empty($data->completionpostsenabled) || !$autocompletion) {
- $data->completionposts = 0;
+ if (!empty($data->completionunlocked)) {
+ $autocompletion = !empty($data->completion) && $data->completion==COMPLETION_TRACKING_AUTOMATIC;
+ if (empty($data->completiondiscussionsenabled) || !$autocompletion) {
+ $data->completiondiscussions = 0;
+ }
+ if (empty($data->completionrepliesenabled) || !$autocompletion) {
+ $data->completionreplies = 0;
+ }
+ if (empty($data->completionpostsenabled) || !$autocompletion) {
+ $data->completionposts = 0;
+ }
}
return $data;
}
View
@@ -196,10 +196,12 @@ function get_data() {
if (!$data) {
return false;
}
- // Turn off completion settings if the checkboxes aren't ticked
- $autocompletion = !empty($data->completion) && $data->completion==COMPLETION_TRACKING_AUTOMATIC;
- if (empty($data->completionentriesenabled) || !$autocompletion) {
- $data->completionentries = 0;
+ if (!empty($data->completionunlocked)) {
+ // Turn off completion settings if the checkboxes aren't ticked
+ $autocompletion = !empty($data->completion) && $data->completion==COMPLETION_TRACKING_AUTOMATIC;
+ if (empty($data->completionentriesenabled) || !$autocompletion) {
+ $data->completionentries = 0;
+ }
}
return $data;
}
View
@@ -499,24 +499,25 @@ function get_data($slashed = true) {
return false;
}
- // Turn off completion settings if the checkboxes aren't ticked
- $autocompletion = isset($data->completion) && $data->completion == COMPLETION_TRACKING_AUTOMATIC;
+ if (!empty($data->completionunlocked)) {
+ // Turn off completion settings if the checkboxes aren't ticked
+ $autocompletion = isset($data->completion) && $data->completion == COMPLETION_TRACKING_AUTOMATIC;
+
+ if (isset($data->completionstatusrequired) &&
+ is_array($data->completionstatusrequired) && $autocompletion) {
+ $total = 0;
+ foreach (array_keys($data->completionstatusrequired) as $state) {
+ $total |= $state;
+ }
- if (isset($data->completionstatusrequired) && is_array($data->completionstatusrequired)) {
- $total = 0;
- foreach (array_keys($data->completionstatusrequired) as $state) {
- $total |= $state;
+ $data->completionstatusrequired = $total;
+ } else {
+ $data->completionstatusrequired = null;
}
- $data->completionstatusrequired = $total;
- }
-
- if (!$autocompletion) {
- $data->completionstatusrequired = null;
- }
-
- if (!empty($data->completionscoredisabled) || !$autocompletion) {
- $data->completionscorerequired = null;
+ if (!empty($data->completionscoredisabled) || !$autocompletion) {
+ $data->completionscorerequired = null;
+ }
}
return $data;

0 comments on commit fc282e4

Please sign in to comment.