github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 19:02:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Fixed edit category description redirecting without saving (#7192)

Browse Source
This commit is contained in:
Tim Lange 2019-03-18 16:14:17 +01:00 committed by Régis Hanol
parent 298f18cf70
commit 22c75e1c04
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/edit-category-general.js.es6
View File

@ -94,7 +94,7 @@ export default buildCategoryPanel("general", {
actions: { actions: {
showCategoryTopic() { showCategoryTopic() {
DiscourseURL.routeTo(this.get("category.topic_url")); window.open(this.get("category.topic_url"), "_blank").focus();
return false; return false;
} }
} }

2
app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
View File

@ -38,7 +38,7 @@
{{/if}} {{/if}}
{{#if category.topic_url}} {{#if category.topic_url}}
<br> <br>
{{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil-alt" label="category.change_in_category_topic"}} {{d-button class="btn-default edit-category-description" action=(action "showCategoryTopic") icon="pencil-alt" label="category.change_in_category_topic"}}
{{/if}} {{/if}}
</section> </section>
{{/if}} {{/if}}

15
test/javascripts/acceptance/category-edit-test.js.es6
View File

@ -40,6 +40,21 @@ QUnit.test("Editing the category", async assert => {
); );
}); });
QUnit.test("Edit the description without loosing progress", async assert => {
let win = { focus: function() {} };
let windowOpen = sandbox.stub(window, "open").returns(win);
sandbox.stub(win, "focus");
await visit("/c/bug");
await click(".edit-category");
await click(".edit-category-description");
assert.ok(
windowOpen.calledWith("/t/category-definition-for-bug/2", "_blank"),
"opens the category topic in a new tab"
);
});
QUnit.test("Error Saving", async assert => { QUnit.test("Error Saving", async assert => {
await visit("/c/bug"); await visit("/c/bug");