Bläddra i källkod

Display slider after submit for all buttons in feed/update.phtml (#8999)

Slight improvement of https://github.com/FreshRSS/FreshRSS/pull/8612
Inverle 16 timmar sedan
förälder
incheckning
0f0b696cdf
2 ändrade filer med 13 tillägg och 9 borttagningar
  1. 3 3
      app/Controllers/feedController.php
  2. 10 6
      app/views/helpers/feed/update.phtml

+ 3 - 3
app/Controllers/feedController.php

@@ -1013,7 +1013,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 			// Redirect to the main page with correct notification.
 			Minz_Request::good(
 				_t('feedback.sub.feed.actualized', $feed->name()),
-				['params' => ['get' => 'f_' . $id]],
+				['params' => ['get' => 'f_' . $id, 'id' => $id]],
 				notificationName: 'actualizeAction',
 				showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0);
 		} elseif ($nbUpdatedFeeds >= 1) {
@@ -1192,7 +1192,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 
 		Minz_Request::good(
 			_t('feedback.sub.feed.cache_cleared', $feed->name()),
-			['params' => ['get' => 'f_' . $feed->id()]],
+			['params' => ['get' => 'f_' . $feed->id(), 'id' => $feed->id()]],
 			showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
 		);
 	}
@@ -1258,7 +1258,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 		//Give feedback to user.
 		Minz_Request::good(
 			_t('feedback.sub.feed.reloaded', $feed->name()),
-			['params' => ['get' => 'f_' . $feed->id()]],
+			['params' => ['get' => 'f_' . $feed->id(), 'id' => $feed->id()]],
 			showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
 		);
 	}

+ 10 - 6
app/views/helpers/feed/update.phtml

@@ -410,9 +410,9 @@
 			<div class="form-group">
 				<div class="group-controls">
 					<?= _t('sub.feed.number_entries', $nbEntries) ?>
-					<a class="btn" href="<?= _url('feed', 'actualize', 'id', $this->feed->id(), '#', 'slider') ?>">
+					<button class="btn" formaction="<?= _url('feed', 'actualize', 'id', $this->feed->id(), '#', 'slider') ?>">
 						<?= _i('refresh') ?> <?= _t('gen.action.actualize') ?>
-					</a>
+					</button>
 				</div>
 			</div>
 			<?php
@@ -945,10 +945,14 @@
 	<h2><?= _t('sub.feed.maintenance.title') ?></h2>
 	<div class="form-group">
 		<div class="group-controls">
-			<button class="btn btn-important" form="post-csrf" formaction="<?= _url('feed', 'clearCache', 'id', $this->feed->id(), '#', 'slider') ?>">
-				<?= _t('sub.feed.maintenance.clear_cache') ?>
-			</button>
-			<p class="help"><?= _i('help') ?> <?= _t('sub.feed.maintenance.clear_cache_help') ?></p>
+			<form method="post" action="<?= _url('feed', 'clearCache', 'id', $this->feed->id(), '#', 'slider') ?>">
+				<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+				<input type="hidden" name="id" value="<?= $this->feed->id() ?>" />
+				<button class="btn btn-important" type="submit">
+					<?= _t('sub.feed.maintenance.clear_cache') ?>
+				</button>
+				<p class="help"><?= _i('help') ?> <?= _t('sub.feed.maintenance.clear_cache_help') ?></p>
+			</form>
 		</div>
 		<div class="group-controls">
 			<form method="post" action="<?= _url('feed', 'reload', '#', 'slider') ?>">