Improve: manage feed in view within a slider (#4226)

* it works

* small improvements

* Update slider.js

* fixed JS syntax

* slider.js included in main.js

* fix syntax

* delete including of slider.js

* Update extra.js

1 files changed, 14 insertions, 2 deletions

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 23906b36d..c22761bfa 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -23,7 +23,12 @@
 	if ($from === false) {
 		$url = _url('subscription', 'feed', 'id', $this->feed->id());
 	} else {
-		$url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from);
+		$get = Minz_Request::param('get');
+		if (!$get) {
+			$url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from);
+		} else {
+			$url = _url('subscription', 'feed', 'id', $this->feed->id(), 'from', $from, 'get', $get);
+		}
 	}
 	?>
 	<form method="post" action="<?= $url ?>" autocomplete="off">
@@ -129,9 +134,16 @@
 			<div class="group-controls">
 				<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
 				<button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button>
+				<?php
+				if ($from === false) {
+					$url = _url('feed', 'delete', 'id', $this->feed->id());
+				} else {
+					$url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from);
+				}
+				?>
 				<button type="submit" class="btn btn-attention confirm"
 					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
-					formaction="<?= _url('feed', 'delete', 'id', $this->feed->id()) ?>"
+					formaction="<?= $url ?>"
 					formmethod="post"><?= _t('gen.action.remove') ?></button>
 			</div>
 		</div>