From abf11956f93b1c18485c39d0532a93f0f17df891 Mon Sep 17 00:00:00 2001 From: jamiesensei Date: Wed, 22 Nov 2006 15:19:20 +0000 Subject: [PATCH] changed method name addDependency to disabledIf and removed data/mod.html --- lib/formslib.php | 9 +- mod/data/mod.html | 304 ----------------------------------------- mod/data/mod_form.php | 10 +- mod/forum/mod_form.php | 16 +-- 4 files changed, 18 insertions(+), 321 deletions(-) delete mode 100644 mod/data/mod.html diff --git a/lib/formslib.php b/lib/formslib.php index 8a20466b1b..b2173f1303 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -849,12 +849,13 @@ function validate_' . $this->_attributes['id'] . '(frm) { * condition * @param string $condition the condition to check */ - function addDependency($elementName, $dependentOn, $condition='notchecked'){ + function disabledIf($elementName, $dependentOn, $condition='notchecked'){ $dependents=$this->_getElNamesRecursive($elementName); foreach ($dependents as $dependent){ - - $this->_dependencies[$dependentOn][]=array('dependent'=>$dependent, - 'condition'=>$condition); + if ($dependent != $dependentOn) { + $this->_dependencies[$dependentOn][]=array('dependent'=>$dependent, + 'condition'=>$condition); + } } } } diff --git a/mod/data/mod.html b/mod/data/mod.html deleted file mode 100644 index 8f430a2dc1..0000000000 --- a/mod/data/mod.html +++ /dev/null @@ -1,304 +0,0 @@ -dirroot.'/mod/data/lib.php'); - - if (!isset($form->name)) { - $form->name = ''; - } - if (!isset($form->intro)) { - $form->intro = ''; - } - if (!isset($form->keepdays)) { - $form->keepdays = 30; - } - if (!isset($form->studentlogs)) { - $form->studentlogs = 0; - } - if (!isset($form->timeavailablefrom)) { - $form->timeavailablefrom = 0; - } - if (!isset($form->timeavailableto)) { - $form->timeavailableto = 0; - } - if (!isset($form->timeviewfrom)) { - $form->timeviewfrom = 0; - } - if (!isset($form->timeviewto)) { - $form->timeviewto = 0; - } - if (!isset($form->schedule)) { - $form->schedule = 0; - } - if (!isset($form->requiredentries)) { - $form->requiredentries = 0; - } - if (!isset($form->requiredentriestoview)) { - $form->requiredentriestoview = 0; - } - if (!isset($form->maxentries)) { - $form->maxentries = 0; - } - if (!isset($form->rssarticles)) { - $form->rssarticles = 0; - } - if (!isset($form->comments)) { - $form->comments = 0; - } - if (!isset($form->approval)) { - $form->approval = 0; - } - if (!isset($form->scale)) { - $form->scale = 0; - } - if (!isset($form->assessed)) { - $form->assessed = 0; - } -?> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -data_enablerssfeeds) and !empty($CFG->enablerssfeeds)) { ?> - - - - - - - - - - - - -
: - -
:

- '; - helpbutton('questions', get_string('helpquestions'), 'moodle', true, true); - echo '
'; - emoticonhelpbutton('form', 'intro'); - echo '
'; - ?> - 		- intro); ?> -
: - timeavailablefrom) echo 'checked="checked"' ?> /> - timeavailablefrom); - echo " - "; - print_time_selector("availablefromhour", "availablefromminute", $form->timeavailablefrom); - ?> - - - - - -
: - timeavailableto) echo 'checked="checked"' ?> /> - timeavailableto); - echo " - "; - print_time_selector("availabletohour", "availabletominute", $form->timeavailableto); - ?> - - - - - -
: - timeviewfrom) echo 'checked="checked"' ?> /> - timeviewfrom); - echo " - "; - print_time_selector("viewfromhour", "viewfromminute", $form->timeviewfrom); - ?> - - - - - -
: - timeviewto) echo 'checked="checked"' ?> /> - timeviewto); - echo " - "; - print_time_selector("viewtohour", "viewtominute", $form->timeviewto); - ?> - - - - - -
: - requiredentries, get_string('none')); - helpbutton('requiredentries', get_string('requiredentries', 'data'), 'data'); - ?> -
 : - requiredentriestoview, get_string('none')); - helpbutton('requiredentriestoview', get_string('requiredentriestoview', 'data'), 'data'); - ?> -
: - maxentries, get_string('nomaximum', 'data')); - helpbutton('maxentries', get_string('maxentries', 'data'), 'data'); - ?> -
: - get_string('no'), 1 => get_string('yes')); - choose_from_menu($ynoptions, 'comments', $form->comments, ''); - helpbutton('comments', get_string('allowcomments', 'data'), 'data'); - ?> -
: - get_string('no'), 1 => get_string('yes')); - choose_from_menu($ynoptions, 'approval', $form->approval, ''); - helpbutton('requireapproval', get_string('requireapproval', 'data'), 'data'); - ?> -
: - rssarticles, get_string('none')); - echo ' ' . get_string('rsshowmany', 'data'); - ?> -
: - - - '; - -/* - echo ''; -*/ - echo ''; - - echo '
- '; - echo " var subitemsall = ['scale'];"; - echo ''; - - //echo 'assessed) { - echo ' checked="checked" '; - } - echo ' />'; - echo ' '.get_string('ratingsuse', 'data').':'; - echo '
'; - // The odd order below was to maintain backward compatibility - unset($options); - $options[2] = get_string('ratingonlyteachers', 'data', moodle_strtolower($course->teachers)); - $options[1] = get_string('ratingeveryone', 'data'); - echo get_string('users').': '; - echo ''; - choose_from_menu($options, 'assessed', $form->assessed, ''); - echo '
'; - echo get_string('grade').': '; - echo ''; - print_grade_menu($course->id, 'scale', $form->scale, false); - echo '
'; - - echo ''; - echo ''; - - echo ''; - - ?> -
-
- - - - - - - - - - -
-
- - - diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php index dff1de8301..bd38fc2786 100644 --- a/mod/data/mod_form.php +++ b/mod/data/mod_form.php @@ -23,25 +23,25 @@ class data_mod_form extends moodleform_mod { $availablefromgroup[]=&MoodleQuickForm::createElement('date_selector', 'availablefrom', ''); $availablefromgroup[]=&MoodleQuickForm::createElement('checkbox', 'availablefromenabled', '', get_string('enable')); $mform->addGroup($availablefromgroup, 'availablefromgroup', get_string('availablefromdate', 'data'), ' ', false); - $mform->addDependency('availablefromgroup', 'availablefromenabled'); + $mform->disabledIf('availablefromgroup', 'availablefromenabled'); $availabletogroup=array(); $availabletogroup[]=&MoodleQuickForm::createElement('date_selector', 'availableto', ''); $availabletogroup[]=&MoodleQuickForm::createElement('checkbox', 'availabletoenabled', '', get_string('enable')); $mform->addGroup($availabletogroup, 'availabletogroup', get_string('availabletodate', 'data'), ' ', false); - $mform->addDependency('availabletogroup', 'availabletoenabled'); + $mform->disabledIf('availabletogroup', 'availabletoenabled'); $viewfromgroup=array(); $viewfromgroup[]=&MoodleQuickForm::createElement('date_selector', 'viewfrom', ''); $viewfromgroup[]=&MoodleQuickForm::createElement('checkbox', 'viewfromenabled', '', get_string('enable')); $mform->addGroup($viewfromgroup, 'viewfromgroup', get_string('viewfromdate', 'data'), ' ', false); - $mform->addDependency('viewfromgroup', 'viewfromenabled'); + $mform->disabledIf('viewfromgroup', 'viewfromenabled'); $viewtogroup=array(); $viewtogroup[]=&MoodleQuickForm::createElement('date_selector', 'viewto', ''); $viewtogroup[]=&MoodleQuickForm::createElement('checkbox', 'viewtoenabled', '', get_string('enable')); $mform->addGroup($viewtogroup, 'viewtogroup', get_string('viewtodate', 'data'), ' ', false); - $mform->addDependency('viewtogroup', 'viewtoenabled'); + $mform->disabledIf('viewtogroup', 'viewtoenabled'); $countoptions= array(0=>get_string('none'))+ @@ -68,7 +68,7 @@ class data_mod_form extends moodleform_mod { $mform->addElement('checkbox', 'assessed', get_string("allowratings", "data") , get_string('ratingsuse', 'data')); $mform->addElement('modgrade', 'scale', get_string('grade'), false); - $mform->addDependency('scale', 'assessed'); + $mform->disabledIf('scale', 'assessed'); $this->standard_coursemodule_elements(); diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php index 38de1b4af4..cece4deba5 100644 --- a/mod/forum/mod_form.php +++ b/mod/forum/mod_form.php @@ -79,18 +79,18 @@ class forum_mod_form extends moodleform_mod { $mform->addElement('checkbox', 'assessed', get_string('allowratings', 'forum') , get_string('ratingsuse', 'forum')); $mform->addElement('modgrade', 'scale', get_string('grade'), false); - $mform->addDependency('scale', 'assessed'); + $mform->disabledIf('scale', 'assessed'); $mform->addElement('checkbox', 'ratingtime', get_string('ratingtime', 'forum')); - $mform->addDependency('ratingtime', 'assessed'); + $mform->disabledIf('ratingtime', 'assessed'); $mform->addElement('date_time_selector', 'assesstimestart', get_string('from')); - $mform->addDependency('assesstimestart', 'assessed'); - $mform->addDependency('assesstimestart', 'ratingtime'); + $mform->disabledIf('assesstimestart', 'assessed'); + $mform->disabledIf('assesstimestart', 'ratingtime'); $mform->addElement('date_time_selector', 'assesstimefinish', get_string('to')); - $mform->addDependency('assesstimefinish', 'assessed'); - $mform->addDependency('assesstimefinish', 'ratingtime'); + $mform->disabledIf('assesstimefinish', 'assessed'); + $mform->disabledIf('assesstimefinish', 'ratingtime'); //------------------------------------------------------------------------------- @@ -112,7 +112,7 @@ class forum_mod_form extends moodleform_mod { $mform->setDefault('blockafter', '0'); $mform->addRule('blockafter', null, 'numeric', null, 'client'); $mform->setHelpButton('blockafter', array('manageposts', get_string('blockafter', 'forum'),'forum')); - $mform->addDependency('blockafter', 'blockperiod', 0); + $mform->disabledIf('blockafter', 'blockperiod', 0); $mform->addElement('text', 'warnafter', get_string('warnafter', 'forum')); @@ -120,7 +120,7 @@ class forum_mod_form extends moodleform_mod { $mform->setDefault('warnafter', '0'); $mform->addRule('warnafter', null, 'numeric', null, 'client'); $mform->setHelpButton('warnafter', array('manageposts', get_string('warnafter', 'forum'),'forum')); - $mform->addDependency('warnafter', 'blockperiod', 0); + $mform->disabledIf('warnafter', 'blockperiod', 0); //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(); -- 2.39.5