upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix that the migration widget doesn't suggest updated search urls if the sort column/direction is changed (#891)

Browse source 
fixes #890
This commit is contained in:
Johannes Meyer 2023-09-28 10:09:04 +02:00 committed by GitHub
commit 1c83c83d30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
application/controllers/MigrateController.php
View file

@ -107,13 +107,8 @@ class MigrateController extends Controller
foreach ($urls as $urlString) {
$url = Url::fromPath($urlString);
$filter = QueryString::parse($url->getQueryString());
$newFilter = $traverseFilter($filter);
if ($newFilter !== null) {
$result[] = rawurldecode($url->setParams([])->setFilter($newFilter)->getAbsoluteUrl());
} else {
$result[] = $url->getAbsoluteUrl();
}
$filter = $traverseFilter($filter) ?? $filter;
$result[] = rawurldecode($url->setParams([])->setFilter($filter)->getAbsoluteUrl());
}
$response = $this->getResponse()->json();

10
public/js/migrate.js
View file

@ -115,7 +115,7 @@
$target.each((_, container) => {
let $container = $(container);
let href = decodeURI($container.data('icingaUrl'));
let href = decodeURIComponent($container.data('icingaUrl'));
let containerId = $container.attr('id');
if (!!href) {
@ -178,12 +178,12 @@
var containerUrl = '';
if ($container.length) {
containerUrl = decodeURI($container.data('icingaUrl'));
containerUrl = decodeURIComponent($container.data('icingaUrl'));
}
if (suggestionUrl !== containerUrl) {
var $newContainer = $('#main > .container').filter(function () {
return decodeURI($(this).data('icingaUrl')) === suggestionUrl;
return decodeURIComponent($(this).data('icingaUrl')) === suggestionUrl;
});
if ($newContainer.length) {
// Container moved
@ -222,7 +222,7 @@
var $button = $(event.target).closest('button');
var $suggestion = $button.parent();
var $container = $('#' + $suggestion.data('containerId'));
var containerUrl = decodeURI($container.data('icingaUrl'));
var containerUrl = decodeURIComponent($container.data('icingaUrl'));
if ($button.attr('value') === '1') {
// Yes
@ -472,7 +472,7 @@
this.Popup().find('li').each(function () {
var $suggestion = $(this);
var $container = $('#' + $suggestion.data('containerId'));
var containerUrl = decodeURI($container.data('icingaUrl'));
var containerUrl = decodeURIComponent($container.data('icingaUrl'));
if (
// Unknown url, yet
typeof _this.knownMigrations[containerUrl] === 'undefined'