Skip to content
Snippets Groups Projects
Commit 9d0f62c1 authored by Alex Barth's avatar Alex Barth
Browse files

Redirect to node or import form after manual import or delete.

parent 1ab59dfa
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@
Feeds 6.x 1.0 XXXXXXX, 20XX-XX-XX
---------------------------------
- Redirect to node or import form after manual import or delete.
- #663830 Aron Novak, alex_b: When download of URL failed, node w/ empty title
is created.
- #654728 Aron Novak: Fix parsing + data handling error with RDF 1.0 feeds.
......
......@@ -100,6 +100,7 @@ function feeds_import_tab_form(&$form_state, $node) {
$form = array();
$form['#feed_nid'] = $node->nid;
$form['#importer_id'] = $importer_id;
$form['#redirect'] = 'node/'. $node->nid;
return confirm_form($form, t('Import all content from feed?'), 'node/'. $node->nid, '', t('Import'), t('Cancel'), 'confirm feeds update');
}
......@@ -118,16 +119,16 @@ function feeds_import_tab_form_submit($form, $form_state) {
*/
function feeds_delete_tab_form(&$form_state, $importer_id, $node = NULL) {
if (empty($node)) {
$path = 'import/'. $feed_id .'/delete-items';
$form['#redirect'] = 'import/'. $importer_id;
}
else {
$importer_id = feeds_get_importer_id($node->type);
$form['#feed_nid'] = $node->nid;
$path = 'node/'. $node->nid;
$form['#redirect'] = 'node/'. $node->nid;
}
// Form cannot pass on feed object.
$form['#importer_id'] = $importer_id;
return confirm_form($form, t('Delete all items from feed?'), $path, '', t('Delete'), t('Cancel'), 'confirm feeds update');
return confirm_form($form, t('Delete all items from feed?'), $form['#redirect'], '', t('Delete'), t('Cancel'), 'confirm feeds update');
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment