Index: station.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/station.install,v retrieving revision 1.14 diff -u -p -r1.14 station.install --- station.install 19 Apr 2009 23:01:58 -0000 1.14 +++ station.install 26 May 2009 18:00:01 -0000 @@ -74,4 +74,20 @@ function station_update_6000() { } return $ret; +} + +/** + * Remove the "Add multiple" options and suggest that using the Submit Again + * module instead. + */ +function station_update_6001() { + $ret = array(); + + if (variable_get('station_catalog_redirect_on_add', TRUE) || variable_get('station_program_redirect_on_add', TRUE)) { + $ret[] = array('success' => TRUE, 'query' => t("The Station module's add multiple feature has been removed. If you'd like to retain this functionality you should install the Submit Again module.")); + } + variable_del('station_catalog_redirect_on_add'); + variable_del('station_program_redirect_on_add'); + + return $ret; } \ No newline at end of file Index: catalog/station_catalog.admin.inc =================================================================== RCS file: catalog/station_catalog.admin.inc diff -N catalog/station_catalog.admin.inc --- catalog/station_catalog.admin.inc 27 Nov 2008 06:48:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ - 'checkbox', - '#title' => t('Add multiple albums'), - '#default_value' => variable_get('station_catalog_redirect_on_add', TRUE), - '#description' => t('If this is checked after adding a new album you will be redirected back to the new album form. This is much more convienient when entering multiple albums.'), - ); - $form['module_cvs_id'] = array( - '#type' => 'item', - '#value' => '
'. STATION_CATALOG_CVS_ID .'
', - ); - - return system_settings_form($form); -} Index: catalog/station_catalog.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/catalog/station_catalog.install,v retrieving revision 1.13 diff -u -p -r1.13 station_catalog.install --- catalog/station_catalog.install 26 May 2009 17:43:41 -0000 1.13 +++ catalog/station_catalog.install 26 May 2009 18:00:01 -0000 @@ -19,7 +19,6 @@ function station_catalog_uninstall() { taxonomy_del_vocabulary($vid); } variable_del('station_catalog_vocabulary'); - variable_del('station_catalog_redirect_on_add'); } /** Index: catalog/station_catalog.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/catalog/station_catalog.module,v retrieving revision 1.31 diff -u -p -r1.31 station_catalog.module --- catalog/station_catalog.module 19 Apr 2009 21:34:12 -0000 1.31 +++ catalog/station_catalog.module 26 May 2009 18:00:02 -0000 @@ -14,22 +14,6 @@ function station_catalog_help($path, $ar } /** - * Implementation of hook_menu(). - */ -function station_catalog_menu() { - $items['admin/settings/station/catalog'] = array( - 'title' => 'Catalog', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('station_catalog_admin_settings'), - 'file' => 'station_catalog.admin.inc', - 'access arguments' => array('administer site configuration'), - 'type' => MENU_LOCAL_TASK - ); - - return $items; -} - -/** * Implementation of hook_node_info(). */ function station_catalog_node_info() { @@ -125,12 +109,6 @@ function station_catalog_album_prepare(& function station_catalog_album_form($node) { $type = node_get_types('type', $node); - // Make it a little easier when doing data entry and redirect back to the - // add form after submitting a new album. - if (empty($node->nid) && variable_get('station_catalog_redirect_on_add', TRUE)) { - $form['#redirect'] = 'node/add/station-album'; - } - $form['album'] = array( '#type' => 'fieldset', '#title' => t('Album information'), Index: program/station_program.admin.inc =================================================================== RCS file: program/station_program.admin.inc diff -N program/station_program.admin.inc --- program/station_program.admin.inc 27 Nov 2008 06:50:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ - 'checkbox', - '#title' => t('Add multiple programs'), - '#default_value' => variable_get('station_program_redirect_on_add', TRUE), - '#description' => t('If this is checked after adding a new program node you will be redirected back to the new program form. This is much more convenient when entering multiple programs.'), - ); - $form['module_cvs_id'] = array( - '#type' => 'item', - '#value' => '
'. STATION_PROGRAM_CVS_ID .'
', - ); - - return system_settings_form($form); -} Index: program/station_program.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/program/station_program.install,v retrieving revision 1.9 diff -u -p -r1.9 station_program.install --- program/station_program.install 19 Apr 2009 22:34:19 -0000 1.9 +++ program/station_program.install 26 May 2009 18:00:02 -0000 @@ -220,8 +220,6 @@ function station_program_uninstall() { content_field_instance_delete('field_station_program_genre', 'station_program'); content_field_instance_delete('field_station_program_link', 'station_program'); } - - variable_del('station_program_redirect_on_add'); } /** Index: program/station_program.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/program/station_program.module,v retrieving revision 1.19 diff -u -p -r1.19 station_program.module --- program/station_program.module 19 Apr 2009 21:34:12 -0000 1.19 +++ program/station_program.module 26 May 2009 18:00:02 -0000 @@ -16,15 +16,6 @@ function station_program_help($path, $ar * Implementation of hook_menu(). */ function station_program_menu() { - $items['admin/settings/station/program'] = array( - 'title' => 'Program', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('station_program_admin_settings'), - 'access arguments' => array('administer site configuration'), - 'file' => 'station_program.admin.inc', - 'type' => MENU_LOCAL_TASK, - ); - $items['station/autocomplete/program'] = array( 'title' => 'program autocomplete', 'page callback' => 'station_program_autocomplete', @@ -115,12 +106,6 @@ function station_program_access($op, $no function station_program_form(&$node) { $type = node_get_types('type', $node); - // Make it a little easier when doing data entry and redirect back to the - // add form after submitting a new program. - if (empty($node->nid) && variable_get('station_program_redirect_on_add', TRUE)) { - $form['#redirect'] = 'node/add/station-program'; - } - $form['title'] = array( '#type' => 'textfield', '#title' => check_plain($type->title_label),