MDL-55340 mod_feedback: export question labels

This was present in export in 3.0 but got lost during export
refactoring in 3.1
This commit is contained in:
Marina Glancy 2016-08-12 14:45:45 +08:00 committed by Sara Arjona
parent 4a6a2636a0
commit 4e32add0ac
3 changed files with 12 additions and 3 deletions

View file

@ -399,8 +399,8 @@ class mod_feedback_complete_form extends moodleform {
*/
protected function add_item_label($item, $element) {
if (strlen($item->label) && ($this->mode == self::MODE_EDIT || $this->mode == self::MODE_VIEW_TEMPLATE)) {
$name = $element->getLabel();
$name = '('.format_string($item->label).') '.$name;
$name = get_string('nameandlabelformat', 'mod_feedback',
(object)['label' => format_string($item->label), 'name' => $element->getLabel()]);
$element->setLabel($name);
}
}

View file

@ -314,7 +314,15 @@ class mod_feedback_responses_table extends table_sql {
$tablecolumns[] = "val{$nr}";
$itemobj = feedback_get_item_class($item->typ);
$tableheaders[] = $itemobj->get_display_name($item, $headernamepostfix);
$columnheader = $itemobj->get_display_name($item, $headernamepostfix);
if (!$this->is_downloading()) {
$columnheader = shorten_text($columnheader);
}
if (strval($item->label) !== '') {
$columnheader = get_string('nameandlabelformat', 'mod_feedback',
(object)['label' => format_string($item->label), 'name' => $columnheader]);
}
$tableheaders[] = $columnheader;
}
// Add 'Delete entry' column.

View file

@ -195,6 +195,7 @@ $string['multiplesubmit'] = 'Allow multiple submissions';
$string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
$string['name'] = 'Name';
$string['name_required'] = 'Name required';
$string['nameandlabelformat'] = '({$a->label}) {$a->name}';
$string['next_page'] = 'Next page';
$string['no_handler'] = 'No action handler exists for';
$string['no_itemlabel'] = 'No label';