From 5438edf8e988a5cffb220c36eb7587b2d862f8e8 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Mon, 24 Feb 2020 17:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queries/admins/subject_query.rb              | 4 ++--
 app/views/admins/subject_settings/index.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 %>
     <div class="form-group mr-1">
       <label for="status">状态：</label>
-      <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已发布', 'published']] %>
+      <% status_options = [['全部', ''], ['编辑中', 'pending'], ['审核中', 'applying'], ['已公开', 'published']] %>
       <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
     </div>