Permalink
Browse files

MDL-31405 Assignment: Fixed date in reset to be called once

Conflicts:

	mod/assign/locallib.php
  • Loading branch information...
1 parent 267b45e commit ca4349c1ce97bad2bfbf9237f9e1ff2541db490c Rajesh Taneja committed Oct 7, 2013
Showing with 28 additions and 29 deletions.
  1. +12 −12 mod/assign/lib.php
  2. +0 −10 mod/assign/locallib.php
  3. +16 −7 mod/assignment/lib.php
View
@@ -77,18 +77,18 @@ function assign_reset_userdata($data) {
$status = array_merge($status, $assignment->reset_userdata($data));
}
}
- // Updating dates - shift may be negative too.
- $componentstr = get_string('modulenameplural', 'assign');
-
- if ($data->timeshift) {
- shift_course_mod_dates('assign',
- array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
- $data->timeshift,
- $data->courseid);
- $status[] = array('component' => $componentstr,
- 'item' => get_string('datechanged'),
- 'error' => false);
- }
+ // Updating dates - shift may be negative too.
+ $componentstr = get_string('modulenameplural', 'assign');
+
+ if ($data->timeshift) {
+ shift_course_mod_dates('assign',
+ array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
+ $data->timeshift,
+ $data->courseid);
+ $status[] = array('component' => $componentstr,
+ 'item' => get_string('datechanged'),
+ 'error' => false);
+ }
return $status;
}
View
@@ -618,16 +618,6 @@ public function reset_userdata($data) {
assign_reset_gradebook($data->courseid);
}
}
- // Updating dates - shift may be negative too.
- if ($data->timeshift) {
- shift_course_mod_dates('assign',
- array('duedate', 'allowsubmissionsfromdate','cutoffdate'),
- $data->timeshift,
- $data->courseid);
- $status[] = array('component'=>$componentstr,
- 'item'=>get_string('datechanged'),
- 'error'=>false);
- }
return $status;
}
View
@@ -2369,13 +2369,6 @@ function reset_userdata($data) {
assignment_reset_gradebook($data->courseid, $this->type);
}
}
-
- /// updating dates - shift may be negative too
- if ($data->timeshift) {
- shift_course_mod_dates('assignment', array('timedue', 'timeavailable'), $data->timeshift, $data->courseid);
- $status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged').': '.$typestr, 'error'=>false);
- }
-
return $status;
}
@@ -3888,6 +3881,22 @@ function assignment_reset_userdata($data) {
$status = array_merge($status, $ass->reset_userdata($data));
}
+ // Updating dates - shift may be negative too.
+ if ($data->timeshift) {
+ $plugintypestrkey = 'type'.$this->type;
+ if (get_string_manager()->string_exists($plugintypestrkey, 'assignment')) {
+ $typestr = get_string_manager()->get_string($plugintypestrkey, 'assignment');
+ } else {
+ $typestr = get_string_manager()->get_string($plugintypestrkey, 'assignment_'.$this->type);
+ }
+ shift_course_mod_dates('assignment',
+ array('timedue', 'timeavailable'),
+ $data->timeshift,
+ $data->courseid);
+ $status[] = array('component' => get_string('modulenameplural', 'assignment'),
+ 'item' => get_string('datechanged').': '.$typestr,
+ 'error' => false);
+ }
return $status;
}

0 comments on commit ca4349c

Please sign in to comment.