Missing page redirect after deleting an article

Fixes #2774

diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 0047dea966f7d413b3db577c8575b7e86d084053..f29c153fa28663f5ca6d06e1c334a8267b1d2772 100644 (file)
--- 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 abc318c16d06d1519e42f386e837e571eb452b69..84ce9ef10f42cc1657c28ff09e4a4a1a067761ff 100644 (file)
--- 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;