--- views_scheduler.module 2006-09-21 20:02:40.000000000 -0500 +++ new.module 2006-10-05 09:05:47.000000000 -0500 @@ -88,26 +88,27 @@ drupal_set_title(t('Administer scheduled views')); $result = pager_query( - "SELECT v.name AS name, v.menu_title AS menu_title, vs.vschedule_id AS vs_id, vs.node AS node, + "SELECT v.name AS name, v.vid, s.schedule_title AS title, vs.vschedule_id AS vs_id, vs.node AS node, CONCAT('Every ',s.every, ' ', s.frequency, '(s)') AS scheduled FROM {view_view} as v LEFT JOIN ({view_schedules} vs , {schedules} s) ON (vs.vschedule_id = s.publication_id ) WHERE v.name = vs.view ORDER BY v.name", $num_views); while ($view = db_fetch_object($result)) { $items[] = array($view->name, - views_get_title($view, 'menu'), + check_plain($view->title), $view->scheduled, - theme('links', array(l(t('Add Actions'), "admin/schedule_views/add_actions/$view->vs_id"), - l(t('Edit Schedule'), "admin/schedule_views/edit_schedule/$view->vs_id"), - l(t('Delete Schedule'), "admin/schedule_views/delete/$view->vs_id"))) + theme('links', array(l(t('add actions'), "admin/schedule_views/add_actions/$view->vs_id"), + l(t('edit schedule'), "admin/schedule_views/edit_schedule/$view->vs_id"), + l(t('delete schedule'), "admin/schedule_views/delete/$view->vs_id"), + l(t('edit view'), "admin/views/edit/$view->vid"))) ); } if ($items) { $output = theme('table', array(t('View'), - t('Title'), - t('Schedule'), + t('Schedule title'), + t('Frequency'), t('Options')), $items, array("cellpadding" => "4"), t('This screen shows all of the views that are currently scheduled. Once a view has been scheduled, you should add actions to it by going to "Add Actions" option.') @@ -154,12 +155,12 @@ } /* - * Set the defual values for a new schedule + * Set the default values for a new schedule */ function _views_scheduler_get_default_values() { $schedule = new stdClass(); - $schedule->hour = date("G"); + $schedule->hour = date("G")+1; $schedule->date = date("m/d/y"); $schedule->frequency = 'manual'; $schedule->every = ''; @@ -240,7 +241,6 @@ '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, - '#description' => t('Schedule Frequency'), ); $form['schedule']['every'] = array( '#type' => 'textfield', @@ -249,7 +249,6 @@ '#size' => 5, '#maxlength' => 3, '#required' => TRUE, - '#description' => t('Every'), ); $form['schedule']['frequency'] = array( '#type' => 'radios', @@ -356,7 +355,8 @@ db_query("UPDATE {schedules} SET schedule_title = '%s', next = '%d', every = '%d', frequency = '%s' WHERE schedule_id = '%d' AND publication_id = '%d'", $form_values['details']['name'], $form_values['sendtime'], $form_values['schedule']['every'], $form_values['schedule']['frequency'], $form_values['schedule_id'], $form_values['view_schedule_id']); - drupal_set_message(t('The schedule %n has been updated.', array('%n' => $form_values['details']['name']))); + drupal_set_message(t('The schedule %n has been updated.', array('%n' => $form_values['details']['name']))); + drupal_goto('admin/schedule_views'); } else{ db_query("INSERT INTO {view_schedules} (vschedule_id , view , node) VALUES (NULL, '%s', '%d')", $form_values['details']['view'], $form_values['details']['node']); @@ -364,7 +364,8 @@ db_query("INSERT INTO {schedules} (schedule_id, schedule_title, type, publication_id, start, first, next, last, every, frequency) VALUES (NULL, '%s','view', '%d', '%d', '%d', '%d', '%d', '%d', '%s')", $form_values['details']['name'], $view_schedule_id, 0, 0, $form_values['sendtime'],0 ,$form_values['schedule']['every'], $form_values['schedule']['frequency']); - drupal_set_message(t('Your form has been saved.')); + drupal_set_message(t('The schedule %n has been created.', array('%n' => $form_values['details']['name']))); + drupal_goto('admin/schedule_views'); } }