Skip to content

Commit

Permalink
migrate.js: Decode urls prior comparison with migration results
Browse files Browse the repository at this point in the history
The latter is now always decoded, since #787
  • Loading branch information
nilmerg committed Jun 27, 2023
1 parent 64c83be commit 072ed80
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions public/js/migrate.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@

$target.each((_, container) => {
let $container = $(container);
let href = $container.data('icingaUrl');
let href = decodeURI($container.data('icingaUrl'));
let containerId = $container.attr('id');

if (!! href) {
Expand Down Expand Up @@ -180,12 +180,12 @@

var containerUrl = '';
if ($container.length) {
containerUrl = $container.data('icingaUrl');
containerUrl = decodeURI($container.data('icingaUrl'));
}

if (suggestionUrl !== containerUrl) {
var $newContainer = $('#main > .container').filter(function () {
return $(this).data('icingaUrl') === suggestionUrl;
return decodeURI($(this).data('icingaUrl')) === suggestionUrl;
});
if ($newContainer.length) {
// Container moved
Expand Down Expand Up @@ -224,7 +224,7 @@
var $button = $(event.target).closest('button');
var $suggestion = $button.parent();
var $container = $('#' + $suggestion.data('containerId'));
var containerUrl = $container.data('icingaUrl');
var containerUrl = decodeURI($container.data('icingaUrl'));

if ($button.attr('value') === '1') {
// Yes
Expand Down Expand Up @@ -474,7 +474,7 @@
this.Popup().find('li').each(function () {
var $suggestion = $(this);
var $container = $('#' + $suggestion.data('containerId'));
var containerUrl = $container.data('icingaUrl');
var containerUrl = decodeURI($container.data('icingaUrl'));
if (
// Unknown url, yet
typeof _this.knownMigrations[containerUrl] === 'undefined'
Expand Down

0 comments on commit 072ed80

Please sign in to comment.