Index: plugins/uts_path/uts_path.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uts/plugins/uts_path/uts_path.module,v
retrieving revision 1.15
diff -u -r1.15 uts_path.module
--- plugins/uts_path/uts_path.module	30 Dec 2008 07:24:43 -0000	1.15
+++ plugins/uts_path/uts_path.module	15 Jan 2009 06:52:52 -0000
@@ -191,47 +191,45 @@
 }
 
 /**
- * Implementation of hook_form_alter().
+ * Implementation of hook_form_alter(): uts_task_node_form.
  *
  * Add the ideal user path field set to the task form.
  */
-function uts_path_form_alter(&$form, $form_state, $form_id) {
-  if ($form_id == 'uts_task_node_form') {
-    $form['uts_path'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Ideal user path'),
-      '#description' => t('The ideal path the user will take to complete the task. <strong>You must save the
-                           task before can record ideal steps.</strong>'),
-      '#weight' => -7
-    );
-    $form['uts_path']['list'] = array(
-      '#type' => 'item',
-      '#value' => uts_path_render_ideal($form['nid']['#value']),
-      '#weight' => -10
-    );
-    $form['uts_path']['record'] = array(
-      '#type' => 'submit',
-      '#value' => t('Record steps'),
-      '#submit' => array('uts_path_open_record_ideal'),
-      '#weight' => -9,
-      '#disabled' => !$form['nid']['#value']
-    );
-    $form['uts_path']['clear'] = array(
-      '#type' => 'submit',
-      '#value' => t('Clear'),
-      '#submit' => array('uts_path_record_ideal_form_submit'),
-      '#weight' => -8,
-      '#disabled' => !$form['nid']['#value']
-    );
-  }
+function uts_path_form_uts_task_node_form_alter(&$form, $form_state) {
+  $form['uts_path'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Ideal user path'),
+    '#description' => t('The ideal path the user should take to complete the task.'),
+    '#weight' => -7
+  );
+  $form['uts_path']['list'] = array(
+    '#type' => 'item',
+    '#value' => uts_path_render_ideal($form['nid']['#value']),
+    '#weight' => -10
+  );
+  $form['uts_path']['record'] = array(
+    '#type' => 'submit',
+    '#value' => t('Record steps'),
+  	'#submit' => array('node_form_submit', 'uts_path_open_record_ideal'),
+    '#weight' => -9,
+  );
+  $form['uts_path']['clear'] = array(
+    '#type' => 'submit',
+    '#value' => t('Clear'),
+    '#submit' => array('uts_path_record_ideal_form_submit'),
+    '#weight' => -8,
+  );
 }
 
 /**
  * Open the ideal path recorder and record the current task NID.
  */
 function uts_path_open_record_ideal($form, &$form_state) {
+  $node = node_form_submit_build_node($form, $form_state);
+  $form_state['rebuild'] = FALSE; // Reset changed rebuild attribute, so that #redirect still works.
+
   variable_set('uts_path_ideal_recorder', UTS_PATH_RECORDER_OPEN);
-  variable_set('uts_path_ideal_recorder_task_nid', $form_state['values']['nid']);
+  variable_set('uts_path_ideal_recorder_task_nid', $node->nid);
 
   // TODO Figure out how to make ideal path recorder work cleanly in base environment.
 /*
Index: uts.node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uts/uts.node.inc,v
retrieving revision 1.36
diff -u -r1.36 uts.node.inc
--- uts.node.inc	27 Dec 2008 07:30:39 -0000	1.36
+++ uts.node.inc	15 Jan 2009 06:52:51 -0000
@@ -380,12 +380,6 @@
       // Insert task into specific study.
       uts_tasks_import($node->study_nid, array($node->nid));
     }
-
-    if (!$node->revision) {
-      // First time saving task.
-      drupal_set_message(t('You can return to the <a href="@task">task edit</a> page and record the ideal steps.',
-                            array('@task' => url('admin/uts/tasks/' . $node->nid . '/edit'))));
-    }
   }
   else if ($type->orig_type == UTS_ENVIRONMENT) {
     if (!$node->revision) {