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

Merge branch 'MDL-80865-403' of https://github.com/paulholden/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2024-03-13 12:18:53 +01:00
parent d03306a1ce 191ac5c44c
commit f6c86bbd1b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
customfield/field/textarea/classes/data_controller.php
+4 -1
View File
@@ -146,7 +146,7 @@ class data_controller extends \core_customfield\data_controller {
/**
* Checks if the value is empty, overriding the base method to ensure it's the "text" element of our value being compared
*
* @param mixed $value
* @param string|string[] $value
* @return bool
*/
protected function is_empty($value): bool {
@@ -196,6 +196,9 @@ class data_controller extends \core_customfield\data_controller {
require_once($CFG->libdir . '/filelib.php');
$value = $this->get_value();
if ($this->is_empty($value)) {
return null;
}
if ($dataid = $this->get('id')) {
$context = $this->get_context();
customfield/field/textarea/tests/plugin_test.php
+8 -3
View File
@@ -25,10 +25,12 @@ use core_customfield_test_instance_form;
* @package customfield_textarea
* @copyright 2019 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \customfield_textarea\field_controller
* @covers \customfield_textarea\data_controller
*/
class plugin_test extends \advanced_testcase {
/** @var stdClass[] */
/** @var \stdClass[] */
private $courses = [];
/** @var \core_customfield\category_controller */
private $cfcat;
@@ -61,7 +63,7 @@ class plugin_test extends \advanced_testcase {
$this->cfdata[1] = $this->get_generator()->add_instance_data($this->cfields[1], $this->courses[1]->id,
['text' => 'Value1', 'format' => FORMAT_MOODLE]);
$this->cfdata[2] = $this->get_generator()->add_instance_data($this->cfields[1], $this->courses[2]->id,
['text' => 'Value2', 'format' => FORMAT_MOODLE]);
['text' => '<br />', 'format' => FORMAT_MOODLE]);
$this->setUser($this->getDataGenerator()->create_user());
}
@@ -170,7 +172,7 @@ class plugin_test extends \advanced_testcase {
$form = new core_customfield_test_instance_form('post', ['handler' => $handler, 'instance' => $this->courses[1]]);
$handler->instance_form_save($form->get_data());
$this->assertEmpty(\core_customfield\data_controller::create($this->cfdata[1]->get('id'))->export_value());
$this->assertNull(\core_customfield\data_controller::create($this->cfdata[1]->get('id'))->export_value());
}
/**
@@ -180,6 +182,9 @@ class plugin_test extends \advanced_testcase {
$this->assertEquals('Value1', $this->cfdata[1]->get_value());
$this->assertEquals('<div class="text_to_html">Value1</div>', $this->cfdata[1]->export_value());
// Field with empty data.
$this->assertNull($this->cfdata[2]->export_value());
// Field without data but with a default value.
$d = \core_customfield\data_controller::create(0, null, $this->cfields[3]);
$this->assertEquals('Value3', $d->get_value());