diff --git a/app/queries/admins/subject_query.rb b/app/queries/admins/subject_query.rb index dc459885b..0415deb9f 100644 --- a/app/queries/admins/subject_query.rb +++ b/app/queries/admins/subject_query.rb @@ -18,9 +18,9 @@ class Admins::SubjectQuery < ApplicationQuery status = case params[:status].to_s.strip when "editing" then {status: 0} - when "processed" then {status: 2, public: 0} + when "applying" then {status: 2, public: [0, 1]} when "pending" then {public: 1} - when "publiced" then {public: 2} + when "published" then {public: 2} end subjects = subjects.where(status) if status diff --git a/app/views/admins/subject_settings/index.html.erb b/app/views/admins/subject_settings/index.html.erb index bcd2a2fc8..b46c1d90d 100644 --- a/app/views/admins/subject_settings/index.html.erb +++ b/app/views/admins/subject_settings/index.html.erb @@ -6,7 +6,7 @@ <%= form_tag(admins_subject_settings_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已发布', 'published']] %> + <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已公开', 'published']] %> <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>