Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes for Feed Me

## Unreleased

- Feed Me settings are now only available when `allowAdminChanges` are set to `true`. ([#1581](https://github.com/craftcms/feed-me/pull/1581))

## 5.9.0 - 2024-11-26

- Added the `assetDownloadGuzzle` config setting which defaults to `false`. When it is set to `true`, Feed Me will use Guzzle to download assets instead curl directly. ([#1549](https://github.com/craftcms/feed-me/pull/1549))
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function renderInlineCode(tokens, idx, options, env, renderer) {
var token = tokens[idx];

return `<code v-pre ${renderer.renderAttrs(token)}>${escapeHtml(
tokens[idx].content,
tokens[idx].content
)}</code>`;
}

Expand Down
1 change: 1 addition & 0 deletions src/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ private function _registerCpRoutes(): void
'feed-me/feeds/run/<feedId:\d+>' => 'feed-me/feeds/run-feed',
'feed-me/feeds/status/<feedId:\d+>' => 'feed-me/feeds/status-feed',
'feed-me/logs' => 'feed-me/logs/logs',
'feed-me/utilities' => ['template' => 'feed-me/utilities/index'],
'feed-me/settings/general' => 'feed-me/base/settings',
]);
});
Expand Down
4 changes: 3 additions & 1 deletion src/controllers/BaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class BaseController extends Controller
*/
public function actionSettings(): Response
{
$this->requireAdmin();

$settings = Plugin::$plugin->getSettings();

return $this->renderTemplate('feed-me/settings/general', [
Expand All @@ -41,6 +43,6 @@ public function actionClearTasks(): Response
->delete('{{%queue}}')
->execute();

return $this->redirect('feed-me/settings/general');
return $this->redirect('feed-me/utilities');
}
}
9 changes: 3 additions & 6 deletions src/templates/settings/general.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% requireAdmin %}

{% extends 'feed-me/_layouts/settings' %}

{% import '_includes/forms' as forms %}
Expand Down Expand Up @@ -38,18 +40,13 @@
options: {
'feeds': 'Feeds'|t('feed-me'),
'logs': 'Logs'|t('feed-me'),
'utilities': 'Utilities'|t('feed-me'),
'settings': 'Settings'|t('feed-me'),
},
values: settings.enabledTabs,
instructions: 'Choose which tabs you would like to be shown.'|t('feed-me'),
}) }}

<hr>

<a class="btn" href="{{ actionUrl('feed-me/base/clear-tasks') }}">
{{ "Clear pending job queue"|t('feed-me') }}
</a>

{% endnamespace %}

{{ parent() }}
Expand Down
14 changes: 14 additions & 0 deletions src/templates/utilities/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends 'feed-me/_layouts' %}

{% set crumbs = [
{ label: craft.feedme.getPluginName|t('feed-me'), url: url('feed-me') },
{ label: "Utilities"|t('feed-me'), url: url('feed-me/utilities') }
] %}

{% set selectedTab = 'utilities' %}

{% block content %}
<a class="btn" href="{{ actionUrl('feed-me/base/clear-tasks') }}">
{{ "Clear pending job queue"|t('feed-me') }}
</a>
{% endblock %}
6 changes: 5 additions & 1 deletion src/web/twig/variables/FeedMeVariable.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,13 @@ public function getTabs(): array
$tabs = [
'feeds' => ['label' => Craft::t('feed-me', 'Feeds'), 'url' => UrlHelper::cpUrl('feed-me/feeds')],
'logs' => ['label' => Craft::t('feed-me', 'Logs'), 'url' => UrlHelper::cpUrl('feed-me/logs')],
'settings' => ['label' => Craft::t('feed-me', 'Settings'), 'url' => UrlHelper::cpUrl('feed-me/settings')],
'utilities' => ['label' => Craft::t('feed-me', 'Utilities'), 'url' => UrlHelper::cpUrl('feed-me/utilities')],
];

if (Craft::$app->getUser()->getIsAdmin() && Craft::$app->getConfig()->getGeneral()->allowAdminChanges) {
$tabs['settings'] = ['label' => Craft::t('feed-me', 'Settings'), 'url' => UrlHelper::cpUrl('feed-me/settings')];
}

if (!is_array($enabledTabs)) {
return $tabs;
}
Expand Down
Loading