github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-27 03:55:42 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

FIX: allow moderators to access /admin/customize/watched_words ()

Browse Source 
Moderators were unable to access `/admin/customize/watched_words`
feature. This was regressed in 61860098d9
This commit is contained in:
Arpit Jalan 2021-04-23 18:51:45 +05:30 committed by GitHub
parent abbb3a6be5
commit e53b474557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 18 deletions
app/assets/javascripts/admin/addon
routes
admin-customize-index.js
templates
admin.hbscustomize.hbs
config
routes.rb

6
app/assets/javascripts/admin/addon/routes/admin-customize-index.js

@ -1,6 +1,10 @@
import Route from "@ember/routing/route";
export default Route.extend({
beforeModel() {
this.transitionTo("adminCustomizeThemes");
if (this.currentUser.admin) {
this.transitionTo("adminCustomizeThemes");
} else {
this.transitionTo("adminWatchedWords");
}
},
});

2
app/assets/javascripts/admin/addon/templates/admin.hbs

@ -18,8 +18,8 @@
{{nav-item route="adminEmail" label="admin.email.title"}}
{{/if}}
{{nav-item route="adminLogs" label="admin.logs.title"}}
{{nav-item route="adminCustomize" label="admin.customize.title"}}
{{#if currentUser.admin}}
{{nav-item route="adminCustomize" label="admin.customize.title"}}
{{nav-item route="adminApi" label="admin.api.title"}}
{{#if siteSettings.enable_backups}}
{{nav-item route="admin.backups" label="admin.backups.title"}}

20
app/assets/javascripts/admin/addon/templates/customize.hbs

@ -1,13 +1,15 @@
{{#admin-nav}}
{{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title" class="admin-customize-themes"}}
{{nav-item route="adminCustomize.colors" label="admin.customize.colors.title" class="admin-customize-colors"}}
{{nav-item route="adminSiteText" label="admin.site_text.title" class="admin-customize-site-text"}}
{{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title" class="admin-customize-email-templates"}}
{{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title" class="admin-customize-email-styles"}}
{{nav-item route="adminUserFields" label="admin.user_fields.title" class="admin-customize-user-fields"}}
{{nav-item route="adminEmojis" label="admin.emoji.title" class="admin-customize-emojis"}}
{{nav-item route="adminPermalinks" label="admin.permalink.title" class="admin-customize-permalinks"}}
{{nav-item route="adminEmbedding" label="admin.embedding.title" class="admin-customize-embedding"}}
{{#if currentUser.admin}}
{{nav-item route="adminCustomizeThemes" label="admin.customize.theme.title" class="admin-customize-themes"}}
{{nav-item route="adminCustomize.colors" label="admin.customize.colors.title" class="admin-customize-colors"}}
{{nav-item route="adminSiteText" label="admin.site_text.title" class="admin-customize-site-text"}}
{{nav-item route="adminCustomizeEmailTemplates" label="admin.customize.email_templates.title" class="admin-customize-email-templates"}}
{{nav-item route="adminCustomizeEmailStyle" label="admin.customize.email_style.title" class="admin-customize-email-styles"}}
{{nav-item route="adminUserFields" label="admin.user_fields.title" class="admin-customize-user-fields"}}
{{nav-item route="adminEmojis" label="admin.emoji.title" class="admin-customize-emojis"}}
{{nav-item route="adminPermalinks" label="admin.permalink.title" class="admin-customize-permalinks"}}
{{nav-item route="adminEmbedding" label="admin.embedding.title" class="admin-customize-embedding"}}
{{/if}}
{{nav-item route="adminWatchedWords" label="admin.watched_words.title" class="admin-customize-watched-words"}}
{{/admin-nav}}

15
config/routes.rb

@ -189,8 +189,8 @@ Discourse::Application.routes.draw do
get "/logs" => "staff_action_logs#index"
# alias
get '/logs/watched_words', to: redirect(relative_url_root + 'admin/customize/watched_words'), constraints: AdminConstraint.new
get '/logs/watched_words/*path', to: redirect(relative_url_root + 'admin/customize/watched_words/%{path}'), constraints: AdminConstraint.new
get '/logs/watched_words', to: redirect(relative_url_root + 'admin/customize/watched_words')
get '/logs/watched_words/*path', to: redirect(relative_url_root + 'admin/customize/watched_words/%{path}')
get "customize" => "color_schemes#index", constraints: AdminConstraint.new
get "customize/themes" => "themes#index", constraints: AdminConstraint.new
@ -239,7 +239,13 @@ Discourse::Application.routes.draw do
resource :email_style, only: [:show, :update]
get 'email_style/:field' => 'email_styles#show', constraints: { field: /html|css/ }
end
resources :embeddable_hosts, constraints: AdminConstraint.new
resources :color_schemes, constraints: AdminConstraint.new
resources :permalinks, constraints: AdminConstraint.new
scope "/customize" do
resources :watched_words, only: [:index, :create, :update, :destroy] do
collection do
get "action/:id" => "watched_words#index"
@ -250,11 +256,6 @@ Discourse::Application.routes.draw do
post "watched_words/upload" => "watched_words#upload"
end
resources :embeddable_hosts, constraints: AdminConstraint.new
resources :color_schemes, constraints: AdminConstraint.new
resources :permalinks, constraints: AdminConstraint.new
get "version_check" => "versions#show"
get "dashboard" => "dashboard#index"