moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-39435-master-int' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-05-06 16:12:28 +01:00
commit 8a414a7950
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/feedback/edit_form.php
View file

@ -34,7 +34,7 @@ class feedback_edit_add_question_form extends moodleform {
$mform = $this->_form; $mform = $this->_form;
//headline //headline
$mform->addElement('header', 'general', get_string('add_items', 'feedback')); $mform->addElement('header', 'general', get_string('content'));
// visible elements // visible elements
$feedback_names_options = feedback_load_feedback_items_options(); $feedback_names_options = feedback_load_feedback_items_options();

5
mod/feedback/item/feedback_item_form_class.php
View file

@ -51,11 +51,12 @@ abstract class feedback_item_form extends moodleform {
array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255)); array('size'=>FEEDBACK_ITEM_LABEL_TEXTBOX_SIZE, 'maxlength'=>255));
} else { } else {
$mform->addElement('hidden', 'dependitem', 0); $mform->addElement('hidden', 'dependitem', 0);
$mform->setType('dependitem', PARAM_INT);
$mform->addElement('hidden', 'dependvalue', ''); $mform->addElement('hidden', 'dependvalue', '');
$mform->setType('dependitem', PARAM_ALPHA);
} }
$mform->setType('dependitem', PARAM_INT);
$mform->setType('dependvalue', PARAM_RAW);
$position_select = $mform->addElement('select', $position_select = $mform->addElement('select',
'position', 'position',
get_string('position', 'feedback').' ', get_string('position', 'feedback').' ',

2
mod/feedback/item/numeric/numeric_form.php
View file

@ -44,11 +44,13 @@ class feedback_numeric_form extends feedback_item_form {
'rangefrom', 'rangefrom',
get_string('numeric_range_from', 'feedback'), get_string('numeric_range_from', 'feedback'),
array('size'=>10, 'maxlength'=>10)); array('size'=>10, 'maxlength'=>10));
$mform->setType('rangefrom', PARAM_INT);
$mform->addElement('text', $mform->addElement('text',
'rangeto', 'rangeto',
get_string('numeric_range_to', 'feedback'), get_string('numeric_range_to', 'feedback'),
array('size'=>10, 'maxlength'=>10)); array('size'=>10, 'maxlength'=>10));
$mform->setType('rangeto', PARAM_INT);
parent::definition(); parent::definition();
$this->set_data($item); $this->set_data($item);

1
mod/feedback/lang/en/feedback.php
View file

@ -23,7 +23,6 @@
*/ */
$string['add_item'] = 'Add question to activity'; $string['add_item'] = 'Add question to activity';
$string['add_items'] = 'Add question to activity';
$string['add_pagebreak'] = 'Add a page break'; $string['add_pagebreak'] = 'Add a page break';
$string['adjustment'] = 'Adjustment'; $string['adjustment'] = 'Adjustment';
$string['after_submit'] = 'After submission'; $string['after_submit'] = 'After submission';

3
mod/feedback/mod_form.php
View file

@ -108,9 +108,10 @@ class mod_feedback_mod_form extends moodleform_mod {
array('size'=>'4', array('size'=>'4',
'disabled'=>'disabled', 'disabled'=>'disabled',
'value'=>$multiple_submit_value)); 'value'=>$multiple_submit_value));
$mform->setType('multiple_submit_static', PARAM_RAW);
$mform->addElement('hidden', 'multiple_submit', ''); $mform->addElement('hidden', 'multiple_submit', '');
$mform->setType('', PARAM_INT); $mform->setType('multiple_submit', PARAM_INT);
$mform->addHelpButton('multiple_submit_static', 'multiplesubmit', 'feedback'); $mform->addHelpButton('multiple_submit_static', 'multiplesubmit', 'feedback');
} else { } else {
$mform->addElement('selectyesno', $mform->addElement('selectyesno',