From 925b05e004913a624e6fa1928a71ca0c6268190a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 5 Sep 2022 11:38:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?nps=E5=B7=B2=E6=89=93=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/nps_controller.rb    | 1 +
 app/views/admins/nps/_user_np_list.html.erb | 2 +-
 app/views/admins/nps/index.html.erb         | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/nps_controller.rb b/app/controllers/admins/nps_controller.rb
index 4eacba4e7..491e62778 100644
--- a/app/controllers/admins/nps_controller.rb
+++ b/app/controllers/admins/nps_controller.rb
@@ -7,6 +7,7 @@ class Admins::NpsController < Admins::BaseController
       sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'
       @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
     end
+    @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present?
     @user_nps = paginate @user_nps.includes(:user)
   end
 
diff --git a/app/views/admins/nps/_user_np_list.html.erb b/app/views/admins/nps/_user_np_list.html.erb
index f4246c701..f2d5196e9 100644
--- a/app/views/admins/nps/_user_np_list.html.erb
+++ b/app/views/admins/nps/_user_np_list.html.erb
@@ -21,7 +21,7 @@
         </td>
         <td><%= display_text(nps.created_at&.strftime('%Y-%m-%d %H:%M')) %></td>
         <td><%= display_text(nps.user.last_login_on&.strftime('%Y-%m-%d %H:%M')) %></td>
-        <td><%= nps.score %></td>
+        <td><%= nps.action_type == 'close' ? '--' : nps.score %></td>
         <td><%= nps.memo %></td>
       </tr>
     <% end %>
diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index f599d00a1..e36066cb8 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -6,6 +6,10 @@
   <%= form_tag(admins_nps_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
+    <label for="done_score">
+      是否管理员
+    </label>
+    <%= check_box_tag("done_score", true, false, id: "done_score", style: 'margin-left: 2px;') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
 
     <span style="margin-left: 50px;margin-right: 10px;">NPS系统开关</span>

From 60894f00b1586285a4f459f50297bd8421984975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Mon, 5 Sep 2022 11:42:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?nps=E5=B7=B2=E6=89=93=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/nps/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admins/nps/index.html.erb b/app/views/admins/nps/index.html.erb
index e36066cb8..cc3eb94ad 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -7,7 +7,7 @@
 
     <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'ID/姓名/邮箱/手机号检索') %>
     <label for="done_score">
-      是否管理员
+      是否已打分
     </label>
     <%= check_box_tag("done_score", true, false, id: "done_score", style: 'margin-left: 2px;') %>
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>

From a438ab6f3ef72dd82585db7f7bb0d55ef47e5fd4 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 6 Sep 2022 14:57:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=ADlocale=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/contents/create_form.rb               | 2 +-
 config/locales/forms/create_file_form.zh-CN.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 config/locales/forms/create_file_form.zh-CN.yml

diff --git a/app/forms/contents/create_form.rb b/app/forms/contents/create_form.rb
index 73341661c..ec60697d6 100644
--- a/app/forms/contents/create_form.rb
+++ b/app/forms/contents/create_form.rb
@@ -3,7 +3,7 @@ class Contents::CreateForm < BaseForm
 
   validates :filepath, presence: true
 
-  validates :new_branch, length: { maximum: 50, too_long: "分支名称过长，仅支持%{count}的长度"}
+  validates :new_branch, length: { maximum: 100, too_long: "过长，仅支持%{count}的长度"}
 
   validate :check_branch
 
diff --git a/config/locales/forms/create_file_form.zh-CN.yml b/config/locales/forms/create_file_form.zh-CN.yml
new file mode 100644
index 000000000..0f9ea86a7
--- /dev/null
+++ b/config/locales/forms/create_file_form.zh-CN.yml
@@ -0,0 +1,5 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      contents/create_form:
+        new_branch: 分支名称
\ No newline at end of file