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

FIX: hide 'category read only banner' in categories list page. (#11072)

Browse Source 
Previously, while navigating away from single category page to categories list page "category read only" banner is not hiding automatically.
This commit is contained in:
Vinoth Kannan 2020-11-03 11:29:58 +05:30 committed by GitHub
parent 789e3775df
commit 9b593435b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/controllers/discovery.js
View File

@ -1,4 +1,4 @@
import { alias, not } from "@ember/object/computed"; import { alias, not, equal } from "@ember/object/computed";
import Controller, { inject as controller } from "@ember/controller"; import Controller, { inject as controller } from "@ember/controller";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
@ -10,6 +10,10 @@ export default Controller.extend({
navigationCategory: controller("navigation/category"), navigationCategory: controller("navigation/category"),
application: controller(), application: controller(),
router: service(), router: service(),
viewingCategoriesList: equal(
"router.currentRouteName",
"discovery.categories"
),
loading: false, loading: false,

4
app/assets/javascripts/discourse/app/templates/discovery.hbs
View File

@ -3,7 +3,9 @@
{{else}} {{else}}
<div class="container"> <div class="container">
{{discourse-banner user=currentUser banner=site.banner}} {{discourse-banner user=currentUser banner=site.banner}}
{{category-read-only-banner category=category readOnly=navigationCategory.cannotCreateTopicOnCategory}} {{#unless viewingCategoriesList}}
{{category-read-only-banner category=category readOnly=navigationCategory.cannotCreateTopicOnCategory}}
{{/unless}}
</div> </div>
<div class="list-controls"> <div class="list-controls">