Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
feeds
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
feeds
Commits
9d0f62c1
Commit
9d0f62c1
authored
15 years ago
by
Alex Barth
Browse files
Options
Downloads
Patches
Plain Diff
Redirect to node or import form after manual import or delete.
parent
1ab59dfa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
feeds.pages.inc
+4
-3
4 additions, 3 deletions
feeds.pages.inc
with
5 additions
and
3 deletions
CHANGELOG.txt
+
1
−
0
View file @
9d0f62c1
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
feeds.pages.inc
+
4
−
3
View file @
9d0f62c1
...
...
@@ -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'
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment