diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-06-15 12:47:47 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-06-15 12:47:47 +0200 |
| commit | 228d7adfdb90c3fdd179f80fbfde565eb06e0cec (patch) | |
| tree | 449368813c0ee49e50db55a560dee6e4ffc9cca5 /app/Controllers/configureController.php | |
| parent | 644427b9b1a0cf525b84f4a2aac2d6a5a2f55045 (diff) | |
Fix slider views (#5469)
* Fix slider titles
And fix full-page view of category configuration.
FIx https://github.com/FreshRSS/FreshRSS/pull/5449#issuecomment-1590021947
* Fix user queries and user management
Implement https://github.com/FreshRSS/FreshRSS/pull/5469#issuecomment-1591957935
Diffstat (limited to 'app/Controllers/configureController.php')
| -rw-r--r-- | app/Controllers/configureController.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 2e0b14f4e..592e8c896 100644 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -323,12 +323,13 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { $this->view->feeds = $feed_dao->listFeeds(); $this->view->tags = $tag_dao->listTags() ?: []; - $id = Minz_Request::paramInt('id'); - $this->view->displaySlider = false; - if ($id !== 0) { - $this->view->displaySlider = true; + if (Minz_Request::paramTernary('id') !== null) { + $id = Minz_Request::paramInt('id'); $this->view->query = $this->view->queries[$id]; $this->view->queryId = $id; + $this->view->displaySlider = true; + } else { + $this->view->displaySlider = false; } FreshRSS_View::prependTitle(_t('conf.query.title') . ' · '); @@ -340,7 +341,9 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { * applied to the selected query. */ public function queryAction(): void { - $this->view->_layout(null); + if (Minz_Request::paramBoolean('ajax')) { + $this->view->_layout(null); + } $id = Minz_Request::paramInt('id'); if (Minz_Request::paramTernary('id') === null || empty(FreshRSS_Context::$user_conf->queries[$id])) { @@ -369,22 +372,22 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { if (!empty($params['state']) && is_array($params['state'])) { $queryParams['state'] = (int)(array_sum($params['state'])); } - $queryParams['url'] = Minz_Url::display(['params' => $params]); $name = Minz_Request::paramString('name') ?: _t('conf.query.number', $id + 1); if ('' === $name) { $name = _t('conf.query.number', $id + 1); } $queryParams['name'] = $name; + $queryParams['url'] = Minz_Url::display(['params' => $queryParams]); $queries = FreshRSS_Context::$user_conf->queries; $queries[$id] = (new FreshRSS_UserQuery($queryParams, $feed_dao, $category_dao, $tag_dao))->toArray(); FreshRSS_Context::$user_conf->queries = $queries; FreshRSS_Context::$user_conf->save(); - Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'queries', 'params' => ['id' => $id] ]); + Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'queries', 'params' => ['id' => (string)$id] ]); } - FreshRSS_View::prependTitle(_t('conf.query.title') . ' · ' . $query->getName() . ' · '); + FreshRSS_View::prependTitle($query->getName() . ' · ' . _t('conf.query.title') . ' · '); } /** |