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

Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-09-29 01:14:33 +02:00
parent 71ee163664 f258a958a4
commit d0deb28c24
7 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/uploadcourse/classes/course.php
+5 -5
View File
@@ -582,6 +582,11 @@ class tool_uploadcourse_course {
}
}
// Course start date.
if (!empty($coursedata['startdate'])) {
$coursedata['startdate'] = strtotime($coursedata['startdate']);
}
// Ultimate check mode vs. existence.
switch ($mode) {
case tool_uploadcourse_processor::MODE_CREATE_NEW:
@@ -631,11 +636,6 @@ class tool_uploadcourse_course {
$this->do = self::DO_CREATE;
}
// Course start date.
if (!empty($coursedata['startdate'])) {
$coursedata['startdate'] = strtotime($coursedata['startdate']);
}
// Add role renaming.
$errors = array();
$rolenames = tool_uploadcourse_helper::get_role_names($this->rawdata, $errors);
admin/tool/uploadcourse/tests/course_test.php
+4 -4
View File
@@ -424,7 +424,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
'fullname' => 'Fullname',
'category' => '1',
'visible' => '0',
'startdate' => '8 June 1990',
'startdate' => 644803200,
'idnumber' => '123abc',
'summary' => 'Summary',
'format' => 'weeks',
@@ -451,7 +451,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
$this->assertEquals($defaultdata['fullname'], $course->fullname);
$this->assertEquals($defaultdata['category'], $course->category);
$this->assertEquals($defaultdata['visible'], $course->visible);
$this->assertEquals(mktime(0, 0, 0, 6, 8, 1990), $course->startdate);
$this->assertEquals($defaultdata['startdate'], $course->startdate);
$this->assertEquals($defaultdata['idnumber'], $course->idnumber);
$this->assertEquals($defaultdata['summary'], $course->summary);
$this->assertEquals($defaultdata['format'], $course->format);
@@ -477,7 +477,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
'fullname' => 'Fullname 2',
'category' => $cat->id,
'visible' => '1',
'startdate' => '11 June 1984',
'startdate' => 455760000,
'idnumber' => 'changedid',
'summary' => 'Summary 2',
'format' => 'topics',
@@ -504,7 +504,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
$this->assertEquals($defaultdata['fullname'], $course->fullname);
$this->assertEquals($defaultdata['category'], $course->category);
$this->assertEquals($defaultdata['visible'], $course->visible);
$this->assertEquals(mktime(0, 0, 0, 6, 11, 1984), $course->startdate);
$this->assertEquals($defaultdata['startdate'], $course->startdate);
$this->assertEquals($defaultdata['idnumber'], $course->idnumber);
$this->assertEquals($defaultdata['summary'], $course->summary);
$this->assertEquals($defaultdata['format'], $course->format);
calendar/tests/calendartype_test.php
+1 -1
View File
@@ -232,7 +232,7 @@ class core_calendar_type_testcase extends advanced_testcase {
}
$submitvalues = array('dateselector' . $counter => $date);
$this->assertSame($el->exportValue($submitvalues), array('dateselector' . $counter => $date['timestamp']));
$this->assertSame(array('dateselector' . $counter => $date['timestamp']), $el->exportValue($submitvalues, true));
}
/**
lib/form/dateselector.php
+3 -5
View File
@@ -263,7 +263,6 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group {
* @return array
*/
function exportValue(&$submitValues, $assoc = false) {
$value = null;
$valuearray = array();
foreach ($this->_elements as $element){
$thisexport = $element->exportValue($submitValues[$this->getName()], true);
@@ -275,21 +274,20 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group {
if($this->_options['optional']) {
// If checkbox is on, the value is zero, so go no further
if(empty($valuearray['enabled'])) {
$value[$this->getName()] = 0;
return $value;
return $this->_prepareValue(0, $assoc);
}
}
// Get the calendar type used - see MDL-18375.
$calendartype = \core_calendar\type_factory::get_calendar_instance();
$gregoriandate = $calendartype->convert_to_gregorian($valuearray['year'], $valuearray['month'], $valuearray['day']);
$value[$this->getName()] = make_timestamp($gregoriandate['year'],
$value = make_timestamp($gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
0, 0, 0,
$this->_options['timezone'],
true);
return $value;
return $this->_prepareValue($value, $assoc);
} else {
return null;
}
lib/form/datetimeselector.php
+3 -5
View File
@@ -286,7 +286,6 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
* @return array
*/
function exportValue(&$submitValues, $assoc = false) {
$value = null;
$valuearray = array();
foreach ($this->_elements as $element){
$thisexport = $element->exportValue($submitValues[$this->getName()], true);
@@ -298,8 +297,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
if($this->_options['optional']) {
// If checkbox is on, the value is zero, so go no further
if(empty($valuearray['enabled'])) {
$value[$this->getName()] = 0;
return $value;
return $this->_prepareValue(0, $assoc);
}
}
// Get the calendar type used - see MDL-18375.
@@ -309,7 +307,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
$valuearray['day'],
$valuearray['hour'],
$valuearray['minute']);
$value[$this->getName()] = make_timestamp($gregoriandate['year'],
$value = make_timestamp($gregoriandate['year'],
$gregoriandate['month'],
$gregoriandate['day'],
$gregoriandate['hour'],
@@ -318,7 +316,7 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group {
$this->_options['timezone'],
true);
return $value;
return $this->_prepareValue($value, $assoc);
} else {
return null;
}
lib/form/tests/dateselector_test.php
+1 -1
View File
@@ -133,7 +133,7 @@ class core_form_dateselector_testcase extends advanced_testcase {
$this->assertTrue($el instanceof MoodleQuickForm_date_selector);
$submitvalues = array('dateselector' => $vals);
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues),
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues, true),
"Please check if timezones are updated (Site adminstration -> location -> update timezone)");
}
}
lib/form/tests/datetimeselector_test.php
+1 -1
View File
@@ -145,7 +145,7 @@ class core_form_datetimeselector_testcase extends advanced_testcase {
$this->assertTrue($el instanceof MoodleQuickForm_date_time_selector);
$submitvalues = array('dateselector' => $vals);
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues),
$this->assertSame(array('dateselector' => $vals['timestamp']), $el->exportValue($submitvalues, true),
"Please check if timezones are updated (Site adminstration -> location -> update timezone)");
}
}