Skip to content
Browse files

Merge branch 'wip-mdl-29638-m21' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_21_STABLE
  • Loading branch information...
2 parents 5c04356 + a5b30b0 commit de3476d17162914763fd4d2c762b7c018a17a3cb @nebgor nebgor committed Nov 11, 2011
Showing with 92 additions and 7 deletions.
  1. +1 −1 grade/import/xml/grade_import_form.php
  2. +1 −0 lib/form/filemanager.php
  3. +17 −2 lib/form/filepicker.js
  4. +3 −1 lib/form/filepicker.php
  5. +22 −2 lib/form/form.js
  6. +48 −1 lib/formslib.php
View
2 grade/import/xml/grade_import_form.php
@@ -32,7 +32,6 @@ function definition () {
$mform->setType('id', PARAM_INT);
$mform->addElement('header', 'general', get_string('importfile', 'grades'));
- $mform->disabledIf('url', 'userfile', 'noteq', '');
$mform->addElement('advcheckbox', 'feedback', get_string('importfeedback', 'grades'));
$mform->setDefault('feedback', 0);
@@ -42,6 +41,7 @@ function definition () {
$mform->disabledIf('userfile', 'url', 'noteq', '');
$mform->addElement('text', 'url', get_string('fileurl', 'gradeimport_xml'), 'size="80"');
+ $mform->disabledIf('url', 'userfile', 'noteq', '');
if (!empty($CFG->gradepublishing)) {
$mform->addElement('header', 'publishing', get_string('publishing', 'grades'));
View
1 lib/form/filemanager.php
@@ -45,6 +45,7 @@ function MoodleQuickForm_filemanager($elementName=null, $elementLabel=null, $att
if (!empty($options['maxbytes'])) {
$this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
}
+ $this->_type = 'filemanager';
parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
}
View
19 lib/form/filepicker.js
@@ -1,19 +1,34 @@
M.form_filepicker = {};
-
+M.form_filepicker.Y = null;
+M.form_filepicker.instances = [];
M.form_filepicker.callback = function(params) {
var html = '<a href="'+params['url']+'">'+params['file']+'</a>';
document.getElementById('file_info_'+params['client_id']).innerHTML = html;
+ //When file is added then set status of global variable to true
+ var elementname = M.core_filepicker.instances[params['client_id']].options.elementname;
+ M.form_filepicker.instances[elementname].fileadded = true;
+ //generate event to indicate changes which will be used by disable if or validation code
+ M.form_filepicker.Y.one('#id_'+elementname).simulate('change');
};
/**
* This fucntion is called for each file picker on page.
*/
M.form_filepicker.init = function(Y, options) {
+ //Keep reference of YUI, so that it can be used in callback.
+ M.form_filepicker.Y = Y;
+
+ //For client side validation, initialize file status for this filepicker
+ M.form_filepicker.instances[options.elementname] = {};
+ M.form_filepicker.instances[options.elementname].fileadded = false;
+
+ //Set filepicker callback
options.formcallback = M.form_filepicker.callback;
+
if (!M.core_filepicker.instances[options.client_id]) {
- M.core_filepicker.init(Y, options);
+ M.core_filepicker.init(Y, options);
}
Y.on('click', function(e, client_id) {
e.preventDefault();
View
4 lib/form/filepicker.php
@@ -29,6 +29,7 @@ function MoodleQuickForm_filepicker($elementName=null, $elementLabel=null, $attr
if (!empty($options['maxbytes'])) {
$this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
}
+ $this->_type = 'filepicker';
parent::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
}
@@ -78,6 +79,7 @@ function toHtml() {
$args->maxbytes = $this->_options['maxbytes'];
$args->context = $PAGE->context;
$args->buttonname = $elname.'choose';
+ $args->elementname = $elname;
$html = $this->_getTabs();
$fp = new file_picker($args);
@@ -86,7 +88,7 @@ function toHtml() {
$html .= $OUTPUT->render($fp);
$html .= '<input type="hidden" name="'.$elname.'" id="'.$id.'" value="'.$draftitemid.'" class="filepickerhidden"/>';
- $module = array('name'=>'form_filepicker', 'fullpath'=>'/lib/form/filepicker.js', 'requires'=>array('core_filepicker'));
+ $module = array('name'=>'form_filepicker', 'fullpath'=>'/lib/form/filepicker.js', 'requires'=>array('core_filepicker', 'node', 'node-event-simulate'));
$PAGE->requires->js_init_call('M.form_filepicker.init', array($fp->options), true, $module);
$nonjsfilepicker = new moodle_url('/repository/draftfiles_manager.php', array(
View
24 lib/form/form.js
@@ -278,7 +278,17 @@ M.form.initFormDependencies = function(Y, formid, dependencies) {
} else if (this.getAttribute('type').toLowerCase() == 'checkbox' && !Y.Node.getDOMNode(this).checked) {
return;
}
- lock = lock || this.get('value') == value;
+ //check for filepicker status
+ if (this.getAttribute('class').toLowerCase() == 'filepickerhidden') {
+ var elementname = this.getAttribute('name');
+ if (elementname && M.form_filepicker.instances[elementname].fileadded) {
+ lock = false;
+ } else {
+ lock = true;
+ }
+ } else {
+ lock = lock || this.get('value') == value;
+ }
});
return {
lock : lock,
@@ -299,7 +309,17 @@ M.form.initFormDependencies = function(Y, formid, dependencies) {
} else if (this.getAttribute('type').toLowerCase() == 'checkbox' && !Y.Node.getDOMNode(this).checked) {
return;
}
- lock = lock || this.get('value') != value;
+ //check for filepicker status
+ if (this.getAttribute('class').toLowerCase() == 'filepickerhidden') {
+ var elementname = this.getAttribute('name');
+ if (elementname && M.form_filepicker.instances[elementname].fileadded) {
+ lock = true;
+ } else {
+ lock = false;
+ }
+ } else {
+ lock = lock || this.get('value') != value;
+ }
});
return {
lock : lock,
View
49 lib/formslib.php
@@ -340,6 +340,43 @@ function _validate_files(&$files) {
}
/**
+ * Internal method. Validates filepicker and filemanager files if they are
+ * set as required fields. Also, sets the error message if encountered one.
+ *
+ * @return bool/array with errors
+ */
+ protected function validate_draft_files() {
+ global $USER;
+ $mform =& $this->_form;
+
+ $errors = array();
+ //Go through all the required elements and make sure you hit filepicker or
+ //filemanager element.
+ foreach ($mform->_rules as $elementname => $rules) {
+ $elementtype = $mform->getElementType($elementname);
+ //If element is of type filepicker then do validation
+ if (($elementtype == 'filepicker') || ($elementtype == 'filemanager')){
+ //Check if rule defined is required rule
+ foreach ($rules as $rule) {
+ if ($rule['type'] == 'required') {
+ $draftid = (int)$mform->getSubmitValue($elementname);
+ $fs = get_file_storage();
+ $context = get_context_instance(CONTEXT_USER, $USER->id);
+ if (!$files = $fs->get_area_files($context->id, 'user', 'draft', $draftid, 'id DESC', false)) {
+ $errors[$elementname] = $rule['message'];
+ }
+ }
+ }
+ }
+ }
+ if (empty($errors)) {
+ return true;
+ } else {
+ return $errors;
+ }
+ }
+
+ /**
* Load in existing data as form defaults. Usually new entry defaults are stored directly in
* form definition (new entry form); this function is used to load in data where values
* already exist and data is being edited (edit entry form).
@@ -439,6 +476,16 @@ function validate_defined_fields($validateonnosubmit=false) {
$files = array();
$file_val = $this->_validate_files($files);
+ //check draft files for validation and flag them if required files
+ //are not in draft area.
+ $draftfilevalue = $this->validate_draft_files();
+
+ if ($file_val !== true && $draftfilevalue !== true) {
+ $file_val = array_merge($file_val, $draftfilevalue);
+ } else if ($draftfilevalue !== true) {
+ $file_val = $draftfilevalue;
+ } //default is file_val, so no need to assign.
+
if ($file_val !== true) {
if (!empty($file_val)) {
foreach ($file_val as $element=>$msg) {
@@ -2293,7 +2340,7 @@ function finishForm(&$form){
if (!$form->isFrozen()) {
$args = $form->getLockOptionObject();
if (count($args[1]) > 0) {
- $PAGE->requires->js_init_call('M.form.initFormDependencies', $args, false, moodleform::get_js_module());
+ $PAGE->requires->js_init_call('M.form.initFormDependencies', $args, true, moodleform::get_js_module());
}
}
}

0 comments on commit de3476d

Please sign in to comment.
Something went wrong with that request. Please try again.