Merge branch 'wip-MDL-56864-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE

This commit is contained in:
Andrew Nicols
2017-12-12 13:39:50 +08:00
3 changed files with 8 additions and 1 deletions
+6 -1
View File
@@ -244,7 +244,11 @@ class MoodleQuickForm_tags extends MoodleQuickForm_autocomplete {
*/
public function exportValue(&$submitValues, $assoc = false) {
if (!$this->is_tagging_enabled()) {
return $assoc ? array($this->getName() => array()) : array();
return $this->_prepareValue([], $assoc);
}
if ($this->_findValue($submitValues) === '_qf__force_multiselect_submission') {
// Nothing was selected.
return $this->_prepareValue([], $assoc);
}
return parent::exportValue($submitValues, $assoc);
@@ -257,6 +261,7 @@ class MoodleQuickForm_tags extends MoodleQuickForm_autocomplete {
$url = new moodle_url('/tag/manage.php', array('tc' => $this->get_tag_collection()));
$context['managestandardtagsurl'] = $url->out(false);
}
$context['nameraw'] = $this->getName();
return $context;
}
@@ -1,6 +1,7 @@
{{< core_form/element-template-inline }}
{{$element}}
{{^element.frozen}}
<input type="hidden" name="{{element.nameraw}}" value="_qf__force_multiselect_submission">
<select class="custom-select {{#error}}form-control-danger{{/error}}" name="{{element.name}}"
id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}}
@@ -1,6 +1,7 @@
{{< core_form/element-template }}
{{$element}}
{{^element.frozen}}
<input type="hidden" name="{{element.nameraw}}" value="_qf__force_multiselect_submission">
<select class="custom-select {{#error}}form-control-danger{{/error}}" name="{{element.name}}"
id="{{element.id}}"
{{#element.multiple}}multiple{{/element.multiple}}