From c94824bce614e2b891da0de849b509858c427d81 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 6 Dec 2018 14:32:47 +0100 Subject: [PATCH] Missing page redirect after deleting an article Fixes #2774 --- wcfsetup/install/files/acp/templates/articleAdd.tpl | 3 ++- .../js/WoltLabSuite/Core/Acp/Ui/Article/InlineEditor.js | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl index 0047dea966..f29c153fa2 100644 --- a/wcfsetup/install/files/acp/templates/articleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl @@ -39,7 +39,8 @@ defaultLanguageId: {@$defaultLanguageID}, isI18n: {if $article->isMultilingual}true{else}false{/if}, languages: { {implode from=$languages item=language glue=', '}{@$language->languageID}: '{$language|encodeJS}'{/implode} } - } + }, + redirectUrl: '{link controller='ArticleList'}{/link}' }); {/if} }); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Article/InlineEditor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Article/InlineEditor.js index abc318c16d..84ce9ef10f 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Article/InlineEditor.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Article/InlineEditor.js @@ -28,8 +28,9 @@ define(['Ajax', 'Core', 'Dictionary', 'Dom/Util', 'EventHandler', 'Language', 'U i18n: { defaultLanguageId: 0, isI18n: false, - languages: {} - } + languages: {}, + }, + redirectUrl: '' }, options); if (objectId) { @@ -255,8 +256,7 @@ define(['Ajax', 'Core', 'Dictionary', 'Dom/Util', 'EventHandler', 'Language', 'U var article = _articles.get(articleId); if (article.isArticleEdit) { - //noinspection JSUnresolvedVariable - window.location = data.returnValues.redirectURL; + window.location = this._options.redirectUrl; } else { var tbody = article.element.parentNode; -- 2.20.1