Index: bones.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bones/bones.module,v
retrieving revision 1.1.4.10
diff -u -8 -p -r1.1.4.10 bones.module
--- bones.module	23 Mar 2009 00:44:56 -0000	1.1.4.10
+++ bones.module	23 Mar 2009 13:11:49 -0000
@@ -228,39 +228,39 @@ function bones_form() {
     $path_extra_description = ' <span class="error">'. t("(The <strong>Path</strong> module must be enabled to use this feature)") .'</span>';
 
   }
   
   $form['node_options']['format'] = filter_form();
 
   $form['node_options']['create_paths'] = array(
     '#title' => t('Automatic Aliases'),
-    '#type' => 'checkbox',
+    '#type' => 'checkboxes',
     '#options' => array(TRUE => t('Create nested path aliases based on imported node titles')),
     '#description' => t('If checked, nested path aliases will be generated based on the titles of imported nodes.  For example, if you have a node titled "Executive Team" that is a child of another node titled "About Us", it will receive an alias of <tt>aboutus/executiveteam</tt>.  If path information is provided in your YAML outline, that will be used instead.') . $path_extra_description,
     '#disabled' => $path_disabled,
-    '#default_value' => TRUE
+    '#default_value' => array(TRUE)
   );
   
   if (function_exists('devel_generate_menu') && user_access('')) {
     $dummy_disabled = FALSE;
     $dummy_extra_description = '';
   }
   else {
     $dummy_disabled = TRUE;
     $dummy_extra_description = ' <span class="error">'. t("(The <strong>Devel generate</strong> module must be enabled to use this feature)") .'</span>';
   }
   
   $form['node_options']['dummy'] = array(
     '#title' => t('Dummy Text'),
-    '#type'  => 'checkbox',
+    '#type'  => 'checkboxes',
     '#options' => array(TRUE => t('Create dummy text for imported nodes')),
     '#description' => t('If checked, imported nodes without a "body" attribute will be populated with dummy text.') . $dummy_extra_description,
     '#disabled' => $dummy_disabled,
-    '#default_value' => FALSE
+    '#default_value' => array(FALSE)
   );
   
   
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Import')
   );
 
@@ -281,20 +281,20 @@ function bones_form_submit($form, &$form
 
   require_once('spyc/spyc.php');
 
   $file = file_save_upload('import');
 
   //Handle parameters
   $add_menu_items = FALSE;
   $plid = NULL;
-  $create_paths = $form_state['values']['create_paths'];
+  $create_paths = $form_state['values']['create_paths'][1];
   $default_type = $form_state['values']['default_type'];
   $format = $form_state['values']['format'];
-  $dummy = $form_state['values']['dummy'];
+  $dummy = $form_state['values']['dummy'][1];
 
   //Include menu admin functions
   require_once(drupal_get_path('module', 'menu') .'/menu.admin.inc');
   
   if ($form_state['values']['option'] == 'createnew'  && !empty($form_state['values']['title'])) {
     $add_menu_items = TRUE;
 
     //Create the new menu and store its ID
@@ -435,27 +435,28 @@ function bones_batch_list($form_state) {
 
 /**
  * Validate the batch list admin form.
  * @param array $form
  * @param array $form_state
  * @return void
  */
 function bones_batch_list_validate($form, $form_state) {
-  //TODO: make sure at least one batch AND action were selected
+  if (isset($form_state['values']['batches']) && !count(array_filter($form_state['values']['batches']))) {
+    form_set_error('batches', t('You need to select at least one batch.'));
+  }
 }
 
 /**
  * Process bones_batch_list form submissions.
  * 
  * Execute the chosen 'Update option' on the selected batches.
  */
 function bones_batch_list_submit($form, &$form_state) {
 
-//  drupal_set_message(dprint_r($form_state, TRUE));
   switch ($form_state['values']['operation']) {
     case 'publish': //Loop through selected batches and publish constituent nodes
       
       // Filter out unchecked batches
       $batches = array_filter($form_state['values']['batches']);
       
       $node_count = 0;
       foreach($batches as $bid) {