course publish MDL-19315 improve publication form (add restriction on…

… the top subject selection)
eSrem · May 14, 2010 · 2b52fe4 · 2b52fe4
1 parent 9f580a8
commit 2b52fe4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 11 deletions.
diff --git a/blocks/community/forms.php b/blocks/community/forms.php
@@ -64,7 +64,7 @@ public function definition() {
                 $options);
 
         $options = array();
-        $options['all'] = get_string('all', 'hub');
+        $options['all'] = get_string('any');
         $options[AUDIENCE_EDUCATORS] = get_string('audienceeducators', 'hub');
         $options[AUDIENCE_STUDENTS] = get_string('audiencestudents', 'hub');
         $options[AUDIENCE_ADMINS] = get_string('audienceadmins', 'hub');
@@ -74,7 +74,7 @@ public function definition() {
         $mform->addHelpButton('audience', 'audience', 'hub');
 
         $options = array();
-        $options['all'] = get_string('all', 'hub');
+        $options['all'] = get_string('any');
         $options[EDULEVEL_PRIMARY] = get_string('edulevelprimary', 'hub');
         $options[EDULEVEL_SECONDARY] = get_string('edulevelsecondary', 'hub');
         $options[EDULEVEL_TERTIARY] = get_string('eduleveltertiary', 'hub');
@@ -96,7 +96,7 @@ public function definition() {
                 $option = "&nbsp;&nbsp;&nbsp;&nbsp;" . $option;
             }
         }
-        $options['all'] = get_string('all', 'hub');
+        $options = array_merge (array('all' => get_string('any')),$options);
         $mform->addElement('select', 'subject', get_string('subject', 'hub'), $options);
         $mform->setDefault('subject', 'all');
         unset($options);
@@ -106,7 +106,7 @@ public function definition() {
         $licensemanager = new license_manager();
         $licences = $licensemanager->get_licenses();
         $options = array();
-        $options['all'] = get_string('all', 'hub');
+        $options['all'] = get_string('any');
         foreach ($licences as $license) {
             $options[$license->shortname] = get_string($license->shortname, 'license');
         }
@@ -118,7 +118,7 @@ public function definition() {
 
         $languages = get_string_manager()->get_list_of_languages();
         asort($languages, SORT_LOCALE_STRING);
-        $languages['all'] = get_string('all', 'hub');
+        $languages = array_merge (array('all' => get_string('any')),$languages);
         $mform->addElement('select', 'language',get_string('language'), $languages);
         $mform->setDefault('language', 'all');
 
@@ -137,11 +137,6 @@ function validation($data, $files) {
             $errors['huburl'] = get_string('nohubselected', 'hub');
         }
 
-        if (!(strlen($this->_form->_submitValues['subject']) == 12 or $this->_form->_submitValues['subject'] == 'all')) {
-
-            $errors['subject'] = get_string('cannotselecttopsubject', 'block_community');
-        }
-
         return $errors;
     }
 

diff --git a/course/publish/forms.php b/course/publish/forms.php
@@ -201,7 +201,7 @@ public function definition() {
         $mform->setType('description', PARAM_TEXT);
 
         $languages = get_string_manager()->get_list_of_languages();
-
+        asort($languages, SORT_LOCALE_STRING);
         $mform->addElement('select', 'language',get_string('language'), $languages);    
         $mform->setDefault('language', $defaultlanguage);
 
@@ -239,6 +239,14 @@ public function definition() {
         $mform->addHelpButton('licence', 'licence', 'hub');
 
         $options = get_string_manager()->load_component_strings('edufields', current_language());
+        foreach ($options as $key => &$option) {
+            $keylength = strlen ( $key );
+            if ( $keylength == 10) {
+                $option = "&nbsp;&nbsp;" . $option;
+            } else  if ( $keylength == 12) {
+                $option = "&nbsp;&nbsp;&nbsp;&nbsp;" . $option;
+            }
+        }
         $mform->addElement('select', 'subject', get_string('subject', 'hub'), $options);
         unset($options);
         $mform->addHelpButton('subject', 'subject', 'hub');
@@ -286,6 +294,20 @@ public function definition() {
         $this->add_action_buttons(false, $buttonlabel);
     }
 
+    function validation($data, $files) {
+        global $CFG;
+
+        $errors = array();
+
+        if (!(strlen($this->_form->_submitValues['subject']) == 12 or $this->_form->_submitValues['subject'] == 'all')) {
+            $errors['subject'] = get_string('cannotselecttopsubject', 'block_community');
+        }
+
+        return $errors;
+    }
+
+
+
 }
 
 ?>