From b3afa15d2ef341d04bc7fae6d3768e5948b1ff10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 20 Sep 2022 09:52:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fixed=20nps=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
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 680b9ceb8..c7c208378 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -35,7 +35,7 @@
     期待更加丰富的功能：<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>，
     希望有新手引导：<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>，
     提升用户体验：<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>，
-    其他：<span class="text-danger"><%= UserNp.where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
+    其他：<span class="text-danger"><%= UserNp.where("action_type !='close'").where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
   </p>
 </div>
 <div class="box admin-list-container users-list-container">

From 2adf87a289ab21e9e03e4df4b5d7d7d25b545734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Tue, 20 Sep 2022 09:52:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fixed=20nps=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
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 680b9ceb8..c7c208378 100644
--- a/app/views/admins/nps/index.html.erb
+++ b/app/views/admins/nps/index.html.erb
@@ -35,7 +35,7 @@
     期待更加丰富的功能：<span class="text-danger"><%= UserNp.where("memo like '%期待更加丰富的功能%'").count %></span>，
     希望有新手引导：<span class="text-danger"><%= UserNp.where("memo like '%希望有新手引导%'").count %></span>，
     提升用户体验：<span class="text-danger"><%= UserNp.where("memo like '%用户体验需进一步提升%'").count %></span>，
-    其他：<span class="text-danger"><%= UserNp.where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
+    其他：<span class="text-danger"><%= UserNp.where("action_type !='close'").where("memo is not null").where.not(id: UserNp.where("memo like '%期待更加丰富的功能%' or memo like '%希望有新手引导%' or memo like '%用户体验需进一步提升%' ").ids).count %></span>
   </p>
 </div>
 <div class="box admin-list-container users-list-container">

From ff881732d29c177062e7a80dfa78b571a3287ef9 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 21 Sep 2022 09:54:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=B2=E8=AE=BE=E7=BD=AE=E8=AF=AD=E8=A8=80=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/concerns/repository/languages_percentagable.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/repository/languages_percentagable.rb b/app/controllers/concerns/repository/languages_percentagable.rb
index 53876327a..8f5d6ff25 100644
--- a/app/controllers/concerns/repository/languages_percentagable.rb
+++ b/app/controllers/concerns/repository/languages_percentagable.rb
@@ -11,6 +11,7 @@ module Repository::LanguagesPercentagable
   end
 
   def update_project_language(language)
+    return if @project.language.present?
     db_language = ProjectLanguage.find_or_create_by!(name: language.keys.first.downcase.upcase_first)
     @project.update_column(:project_language_id, db_language.id)
   rescue