summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Barth2010-09-17 23:58:18 +0000
committerAlex Barth2010-09-17 23:58:18 +0000
commit040ab157c0a83c30667544626418da25f17696e7 (patch)
treee6448471259260e12524f7814a7d47908a8e1db5
parent9ac7872b50d430506fd035c5b4cb5bca1e8940aa (diff)
Adjust all pointers to admin/build/feeds to admin/structure/feeds.
-rw-r--r--feeds.install4
-rw-r--r--feeds.module2
-rw-r--r--feeds_ui/feeds_ui.admin.inc16
-rw-r--r--feeds_ui/feeds_ui.info2
-rw-r--r--feeds_ui/tests/feeds_ui.test28
-rw-r--r--tests/feeds.test.inc10
-rw-r--r--tests/feeds_mapper_locale.test2
-rw-r--r--tests/feeds_mapper_profile.test2
-rw-r--r--tests/feeds_mapper_taxonomy.test2
-rw-r--r--tests/feeds_processor_node.test2
-rw-r--r--tests/feeds_processor_term.test4
-rw-r--r--tests/feeds_processor_user.test2
-rw-r--r--tests/feeds_scheduler.test6
13 files changed, 41 insertions, 41 deletions
diff --git a/feeds.install b/feeds.install
index e515a1f..922cf7d 100644
--- a/feeds.install
+++ b/feeds.install
@@ -473,10 +473,10 @@ function feeds_update_6010() {
drupal_set_message(t('Installed Feeds News and Feeds Import as replacement for Feeds Defaults module. If you were not using Feeds Defaults then you can safely disable Feeds News and Feeds Import.'));
}
if (module_exists('features')) {
- drupal_set_message(t('<strong>Review enabled state of importer configurations on admin/build/feeds and features on admin/build/features.</strong>'));
+ drupal_set_message(t('<strong>Review enabled state of importer configurations on admin/structure/feeds and features on admin/build/features.</strong>'));
}
else {
- drupal_set_message(t('<strong>Review enabled state of importer configurations on admin/build/feeds and Feeds modules on admin/build/modules.</strong>'));
+ drupal_set_message(t('<strong>Review enabled state of importer configurations on admin/structure/feeds and Feeds modules on admin/build/modules.</strong>'));
}
return array();
}
diff --git a/feeds.module b/feeds.module
index ca03915..1e2f0a8 100644
--- a/feeds.module
+++ b/feeds.module
@@ -818,7 +818,7 @@ function feeds_plugin_instance($plugin, $id) {
}
$args = array( '%plugin' => $plugin);
if (user_access('administer feeds')) {
- $args['!link'] = l($id, 'admin/build/feeds/edit/' . $id);
+ $args['!link'] = l($id, 'admin/structure/feeds/edit/' . $id);
drupal_set_message(t('Missing Feeds plugin %plugin. See !link. Check whether all required libraries and modules are installed properly.', $args), 'warning');
}
else {
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 9ea7cae..df5a1ff 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -8,7 +8,7 @@
*/
/**
- * Introductory help for admin/build/feeds/edit/config page
+ * Introductory help for admin/structure/feeds/edit/config page
*/
function feeds_ui_edit_help() {
return t('
@@ -97,10 +97,10 @@ function feeds_ui_overview_form($form, &$form_status) {
if (!$importer->disabled) {
$importer_form['operations'] = array(
'#value' =>
- l($edit, 'admin/build/feeds/edit/'. $importer->id) .' | '.
- l(t('Export'), 'admin/build/feeds/export/'. $importer->id) .' | '.
- l(t('Clone'), 'admin/build/feeds/clone/'. $importer->id) .
- (empty($delete) ? '' : ' | '. l($delete, 'admin/build/feeds/delete/'. $importer->id)),
+ l($edit, 'admin/structure/feeds/edit/'. $importer->id) .' | '.
+ l(t('Export'), 'admin/structure/feeds/export/'. $importer->id) .' | '.
+ l(t('Clone'), 'admin/structure/feeds/clone/'. $importer->id) .
+ (empty($delete) ? '' : ' | '. l($delete, 'admin/structure/feeds/delete/'. $importer->id)),
);
}
else {
@@ -215,7 +215,7 @@ function feeds_ui_create_form_submit($form, &$form_state) {
else {
drupal_set_message(t('A clone of the !name configuration has been created.', array('!name' => $form['#from_importer']->config['name'])));
}
- $form_state['redirect'] = 'admin/build/feeds/edit/'. $importer->id;
+ $form_state['redirect'] = 'admin/structure/feeds/edit/'. $importer->id;
feeds_cache_clear();
}
@@ -223,7 +223,7 @@ function feeds_ui_create_form_submit($form, &$form_state) {
* Delete configuration form.
*/
function feeds_ui_delete_form($form, &$form_state, $importer) {
- $form['#redirect'] = 'admin/build/feeds';
+ $form['#redirect'] = 'admin/structure/feeds';
$form['#importer'] = $importer;
if ($importer->export_type & EXPORT_IN_CODE) {
$title = t('Would you really like to revert the importer @importer?', array('@importer' => $importer->config['name']));
@@ -276,7 +276,7 @@ function feeds_ui_edit_page($importer, $active = 'help', $plugin_key = '') {
$plugins = feeds_get_plugins();
$config = $importer->config;
// Base path for changing the active container.
- $path = 'admin/build/feeds/edit/'. $importer->id;
+ $path = 'admin/structure/feeds/edit/'. $importer->id;
$active_container = array(
'class' => array('active-container'),
diff --git a/feeds_ui/feeds_ui.info b/feeds_ui/feeds_ui.info
index 9637535..153526a 100644
--- a/feeds_ui/feeds_ui.info
+++ b/feeds_ui/feeds_ui.info
@@ -4,6 +4,6 @@ description = Administrative UI for Feeds module.
package = Feeds
dependencies[] = feeds
files[] = feeds_ui.module
-configure = admin/build/feeds
+configure = admin/structure/feeds
core = 7.x
php = 5.2 \ No newline at end of file
diff --git a/feeds_ui/tests/feeds_ui.test b/feeds_ui/tests/feeds_ui.test
index af48c7f..f356c44 100644
--- a/feeds_ui/tests/feeds_ui.test
+++ b/feeds_ui/tests/feeds_ui.test
@@ -52,7 +52,7 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$this->createImporterConfiguration('Test feed', 'test_feed');
// Assert UI elements.
- $this->drupalGet('admin/build/feeds/edit/test_feed');
+ $this->drupalGet('admin/structure/feeds/edit/test_feed');
$this->assertText('Basic settings');
$this->assertText('Fetcher');
$this->assertText('HTTP Fetcher');
@@ -61,43 +61,43 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
$this->assertText('Processor');
$this->assertText('Node processor');
$this->assertText('Getting started');
- $this->assertRaw('admin/build/feeds/edit/test_feed/settings');
- $this->assertRaw('admin/build/feeds/edit/test_feed/settings/FeedsNodeProcessor');
- $this->assertRaw('admin/build/feeds/edit/test_feed/fetcher');
- $this->assertRaw('admin/build/feeds/edit/test_feed/parser');
- $this->assertRaw('admin/build/feeds/edit/test_feed/processor');
+ $this->assertRaw('admin/structure/feeds/edit/test_feed/settings');
+ $this->assertRaw('admin/structure/feeds/edit/test_feed/settings/FeedsNodeProcessor');
+ $this->assertRaw('admin/structure/feeds/edit/test_feed/fetcher');
+ $this->assertRaw('admin/structure/feeds/edit/test_feed/parser');
+ $this->assertRaw('admin/structure/feeds/edit/test_feed/processor');
$this->drupalGet('import');
$this->assertText('Page');
// Select some other plugins.
- $this->drupalGet('admin/build/feeds/edit/test_feed');
+ $this->drupalGet('admin/structure/feeds/edit/test_feed');
$this->clickLink('Change', 0);
$this->assertText('Select a fetcher');
$edit = array(
'plugin_key' => 'FeedsFileFetcher',
);
- $this->drupalPost('admin/build/feeds/edit/test_feed/fetcher', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/test_feed/fetcher', $edit, 'Save');
$this->clickLink('Change', 1);
$this->assertText('Select a parser');
$edit = array(
'plugin_key' => 'FeedsCSVParser',
);
- $this->drupalPost('admin/build/feeds/edit/test_feed/parser', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/test_feed/parser', $edit, 'Save');
$this->clickLink('Change', 2);
$this->assertText('Select a processor');
$edit = array(
'plugin_key' => 'FeedsFeedNodeProcessor',
);
- $this->drupalPost('admin/build/feeds/edit/test_feed/processor', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/test_feed/processor', $edit, 'Save');
// Assert changed configuration.
$this->assertPlugins('test_feed', 'FeedsFileFetcher', 'FeedsCSVParser', 'FeedsFeedNodeProcessor');
// Delete feed.
- $this->drupalPost('admin/build/feeds/delete/test_feed', array(), 'Delete');
+ $this->drupalPost('admin/structure/feeds/delete/test_feed', array(), 'Delete');
$this->drupalGet('import');
$this->assertNoText('Test feed');
@@ -110,20 +110,20 @@ class FeedsUIUserInterfaceTestCase extends FeedsWebTestCase {
'content_type' => 'page',
'import_period' => 3600,
);
- $this->drupalPost('admin/build/feeds/edit/test_feed/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/test_feed/settings', $edit, 'Save');
// Assert results of change.
$this->assertText('Edit importer: Syndication');
$this->assertText('Attached to: Page');
$this->assertText('Refresh: every 1 hour');
- $this->drupalGet('admin/build/feeds');
+ $this->drupalGet('admin/structure/feeds');
$this->assertLink('Page'); // See whether string 'Page' shows up in table.
// Configure processor.
$edit = array(
'content_type' => 'story',
);
- $this->drupalPost('admin/build/feeds/edit/test_feed/settings/FeedsNodeProcessor', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/test_feed/settings/FeedsNodeProcessor', $edit, 'Save');
$this->assertRaw('value="story" selected="selected"');
// Create a feed node.
diff --git a/tests/feeds.test.inc b/tests/feeds.test.inc
index 8c57d9e..9b9a235 100644
--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -93,13 +93,13 @@ class FeedsWebTestCase extends DrupalWebTestCase {
*/
public function createImporterConfiguration($name = 'Syndication', $id = 'syndication') {
// Create new feed configuration.
- $this->drupalGet('admin/build/feeds');
+ $this->drupalGet('admin/structure/feeds');
$this->clickLink('New importer');
$edit = array(
'name' => $name,
'id' => $id,
);
- $this->drupalPost('admin/build/feeds/create', $edit, 'Create');
+ $this->drupalPost('admin/structure/feeds/create', $edit, 'Create');
// Assert message and presence of default plugins.
$this->assertText('Your configuration has been created with default settings.');
@@ -122,7 +122,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$edit = array(
'plugin_key' => $plugin_key,
);
- $this->drupalPost("admin/build/feeds/edit/$id/$type", $edit, 'Save');
+ $this->drupalPost("admin/structure/feeds/edit/$id/$type", $edit, 'Save');
// Assert actual configuration.
$config = unserialize(db_query("SELECT config FROM {feeds_importer} WHERE id = :id", array(':id' => $id))->fetchField());
@@ -141,7 +141,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
* The settings to set.
*/
public function setSettings($id, $plugin, $settings) {
- $this->drupalPost('admin/build/feeds/edit/'. $id .'/settings/'. $plugin, $settings, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/'. $id .'/settings/'. $plugin, $settings, 'Save');
$this->assertText('Your changes have been saved.');
}
@@ -291,7 +291,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
*/
public function addMappings($id, $mappings) {
- $path = 'admin/build/feeds/edit/'. $id .'/mapping';
+ $path = 'admin/structure/feeds/edit/'. $id .'/mapping';
// Iterate through all mappings and add the via the form.
foreach ($mappings as $i => $mapping) {
diff --git a/tests/feeds_mapper_locale.test b/tests/feeds_mapper_locale.test
index 292dd35..86d202a 100644
--- a/tests/feeds_mapper_locale.test
+++ b/tests/feeds_mapper_locale.test
@@ -102,7 +102,7 @@ class FeedsMapperLocaleTestCase extends FeedsMapperTestCase {
$edit = array(
'import_on_create' => FALSE,
);
- $this->drupalPost('admin/build/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
$this->assertText('Do not import on create');
$nid = $this->createFeedNode();
$edit = array(
diff --git a/tests/feeds_mapper_profile.test b/tests/feeds_mapper_profile.test
index ebe8612..833820c 100644
--- a/tests/feeds_mapper_profile.test
+++ b/tests/feeds_mapper_profile.test
@@ -96,7 +96,7 @@ class FeedsMapperProfileTestCase extends FeedsMapperTestCase {
'content_type' => '',
'import_period' => FEEDS_SCHEDULE_NEVER,
);
- $this->drupalPost('admin/build/feeds/edit/profile_import/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/profile_import/settings', $edit, 'Save');
// Import CSV file.
$this->importFile('profile_import', $this->absolutePath() .'/tests/feeds/profile.csv');
diff --git a/tests/feeds_mapper_taxonomy.test b/tests/feeds_mapper_taxonomy.test
index c5d30d5..ac5a364 100644
--- a/tests/feeds_mapper_taxonomy.test
+++ b/tests/feeds_mapper_taxonomy.test
@@ -97,7 +97,7 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
$edit = array(
'import_on_create' => FALSE,
);
- $this->drupalPost('admin/build/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
$this->assertText('Do not import on create');
$nid = $this->createFeedNode();
$terms = array('testterm1', 'testterm2', 'testterm3');
diff --git a/tests/feeds_processor_node.test b/tests/feeds_processor_node.test
index 2cb3cd8..db2a06c 100644
--- a/tests/feeds_processor_node.test
+++ b/tests/feeds_processor_node.test
@@ -267,7 +267,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/build/feeds/edit/syndication_standalone/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/syndication_standalone/settings', $edit, 'Save');
$this->addMappings('syndication_standalone',
array(
array(
diff --git a/tests/feeds_processor_term.test b/tests/feeds_processor_term.test
index e3b01a4..ef43322 100644
--- a/tests/feeds_processor_term.test
+++ b/tests/feeds_processor_term.test
@@ -65,7 +65,7 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/build/feeds/edit/term_import/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/term_import/settings', $edit, 'Save');
$edit = array(
'name' => 'Addams vocabulary',
@@ -75,7 +75,7 @@ class FeedsCSVtoTermsTest extends FeedsWebTestCase {
$edit = array(
'vocabulary' => 1,
);
- $this->drupalPost('admin/build/feeds/edit/term_import/settings/FeedsTermProcessor', $edit, t('Save'));
+ $this->drupalPost('admin/structure/feeds/edit/term_import/settings/FeedsTermProcessor', $edit, t('Save'));
// Import and assert.
$this->importFile('term_import', $this->absolutePath() .'/tests/feeds/users.csv');
diff --git a/tests/feeds_processor_user.test b/tests/feeds_processor_user.test
index 589fc38..6326e01 100644
--- a/tests/feeds_processor_user.test
+++ b/tests/feeds_processor_user.test
@@ -77,7 +77,7 @@ class FeedsCSVtoUsersTest extends FeedsWebTestCase {
$edit = array(
'content_type' => '',
);
- $this->drupalPost('admin/build/feeds/edit/user_import/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/user_import/settings', $edit, 'Save');
// Create roles and assign one of them to the users to be imported.
$manager_rid = $this->drupalCreateRole(array('access content'), 'manager');
diff --git a/tests/feeds_scheduler.test b/tests/feeds_scheduler.test
index 6922f3b..1d3569b 100644
--- a/tests/feeds_scheduler.test
+++ b/tests/feeds_scheduler.test
@@ -71,7 +71,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$edit = array(
'import_on_create' => FALSE,
);
- $this->drupalPost('admin/build/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
$this->assertText('Do not import on create');
$nids = $this->createFeedNodes();
@@ -147,7 +147,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$edit = array(
'import_period' => 0,
);
- $this->drupalPost('admin/build/feeds/edit/syndication/settings', $edit, 'Save');
+ $this->drupalPost('admin/structure/feeds/edit/syndication/settings', $edit, 'Save');
$this->assertText('Refresh: as often as possible');
$this->drupalLogout();
@@ -217,7 +217,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
$this->assertEqual(count($nids), db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND callback = 'feeds_source_import'")->fetchField());
$this->assertEqual(1, db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND callback = 'feeds_importer_expire' AND id = 0")->fetchField());
- $this->drupalPost('admin/build/feeds/delete/syndication', array(), t('Delete'));
+ $this->drupalPost('admin/structure/feeds/delete/syndication', array(), t('Delete'));
$this->assertEqual(0, db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND callback = 'feeds_importer_expire' AND id = 0")->fetchField());
$this->assertEqual(count($nids), db_query("SELECT COUNT(*) FROM {job_schedule} WHERE type = 'syndication' AND callback = 'feeds_source_import'")->fetchField());
}