From 9ca81b06b03a4fe5a5941fbe302737ab654c2f5f Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:04:17 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9EGLCC=20PR=E6=A3=80?=
=?UTF-8?q?=E6=B5=8B=E5=85=A8=E9=83=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/queries/admins/glcc_examine_material.rb | 8 +++-----
app/views/admins/glcc_pr_check/index.html.erb | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index 4e8f2bea7..024dd20af 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/app/queries/admins/glcc_examine_material.rb
@@ -13,11 +13,9 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
- term = params[:term] || [1,2]
- if term.present?
- materials = materials.where(term: term)
- end
- #year
+ term = params[:term].zero ? [1, 2] : params[:term]
+ materials = materials.where(term: term) if term.present?
+ #year
year = if params[:date]
params[:date][:year]
end
diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb
index a70a09f6e..8a453f87c 100644
--- a/app/views/admins/glcc_pr_check/index.html.erb
+++ b/app/views/admins/glcc_pr_check/index.html.erb
@@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['中期考核',1], ['结项考核', 2]] %>
+ <% status_options = [['全部',0]['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
From 025e3f1ac70179029e4ebf150a0e03a60fcd6ebd Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:08:29 +0800
Subject: [PATCH 2/9] fix bug
---
app/queries/admins/glcc_examine_material.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index 024dd20af..b9033ffd3 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/app/queries/admins/glcc_examine_material.rb
@@ -13,7 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
- term = params[:term].zero ? [1, 2] : params[:term]
+ term = params[:term].to_i.zero ? [1, 2] : params[:term].to_i
materials = materials.where(term: term) if term.present?
#year
year = if params[:date]
From 4eb634c109b2b6c906c9858e383e61055c7a9b55 Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:11:28 +0800
Subject: [PATCH 3/9] fix Admins::GlccExamineMaterial bug
---
app/queries/admins/glcc_examine_material.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index b9033ffd3..6194aaa51 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/app/queries/admins/glcc_examine_material.rb
@@ -13,7 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
- term = params[:term].to_i.zero ? [1, 2] : params[:term].to_i
+ term = params[:term].to_i == 0 ? [1, 2] : params[:term].to_i
materials = materials.where(term: term) if term.present?
#year
year = if params[:date]
From f6f3aa53f92411be2fcece86573b677094a4334b Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:31:17 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4Glcc=20PR=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/queries/admins/glcc_examine_material.rb | 2 +-
app/views/admins/glcc_pr_check/index.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index 6194aaa51..89eede29f 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/app/queries/admins/glcc_examine_material.rb
@@ -13,7 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
- term = params[:term].to_i == 0 ? [1, 2] : params[:term].to_i
+ term = params[:term] || [1, 2]
materials = materials.where(term: term) if term.present?
#year
year = if params[:date]
diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb
index 8a453f87c..0dd2b9f6b 100644
--- a/app/views/admins/glcc_pr_check/index.html.erb
+++ b/app/views/admins/glcc_pr_check/index.html.erb
@@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['全部',0]['中期考核',1], ['结项考核', 2]] %>
+ <% status_options = [['全部',]['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
From 1d81361c6a05eca1953896f42468dc1790ec3e12 Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:36:24 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4Glcc=20PR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/queries/admins/glcc_examine_material.rb | 3 +--
app/views/admins/glcc_pr_check/index.html.erb | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb
index 89eede29f..6f9213ddc 100644
--- a/app/queries/admins/glcc_examine_material.rb
+++ b/app/queries/admins/glcc_examine_material.rb
@@ -13,8 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
- term = params[:term] || [1, 2]
- materials = materials.where(term: term) if term.present?
+ materials = materials.where(term: params[:term]) if params[:term].present?
#year
year = if params[:date]
params[:date][:year]
diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb
index 0dd2b9f6b..fdcd58cad 100644
--- a/app/views/admins/glcc_pr_check/index.html.erb
+++ b/app/views/admins/glcc_pr_check/index.html.erb
@@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['全部',]['中期考核',1], ['结项考核', 2]] %>
+ <% status_options = [['全部','']['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
From d993c1f4e1d71b7888de71df18dada843a04a2f3 Mon Sep 17 00:00:00 2001
From: kingChan <281221230@qq.com>
Date: Wed, 12 Jun 2024 17:43:06 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=B0=83=E6=95=B4Glcc=20PR=20=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/admins/glcc_pr_check/index.html.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb
index fdcd58cad..56e27b9d2 100644
--- a/app/views/admins/glcc_pr_check/index.html.erb
+++ b/app/views/admins/glcc_pr_check/index.html.erb
@@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['全部','']['中期考核',1], ['结项考核', 2]] %>
+ <% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
@@ -22,7 +22,7 @@
<%= form_tag(send_mail_admins_glcc_pr_check_index_path, method: :post, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['中期考核',1], ['结项考核', 2]] %>
+ <% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
From 93ad4b046b48ad4f4824cbe8a6614ed7b3dc9b77 Mon Sep 17 00:00:00 2001
From: xxq250
Date: Thu, 13 Jun 2024 16:44:25 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E9=BB=98=E8=AE=A4favicon.ico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/settings/show.json.jbuilder | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index c3e515fd2..db39d1dff 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -31,7 +31,7 @@ json.setting do
json.name default_setting.name
json.nav_logo_url default_setting.nav_logo_url&.[](1..-1)
json.login_logo_url default_setting.login_logo_url&.[](1..-1)
- json.tab_logo_url default_setting.tab_logo_url&.[](1..-1)
+ json.tab_logo_url default_setting.tab_logo_url.present? ? default_setting.tab_logo_url&.[](1..-1) : "favicon.ico"
json.site_page_deploy_domain @deploy_domain
json.subject_banner_url default_setting.subject_banner_url&.[](1..-1)
From 7767f4b262ce99175c00b8002b02949e4d716a78 Mon Sep 17 00:00:00 2001
From: xxq250
Date: Tue, 11 Jun 2024 10:28:55 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 11 ++++++++++-
config/routes.rb | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7608ec3d..b976ee8fa 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -702,6 +702,15 @@ class UsersController < ApplicationController
@user = User.find_by(mail: params[:email])
end
+ #根据login获取用户信息
+ def get_user_info_by_login
+ private_token = "hriEn3UwXfJs3PmyXnSH"
+ sign = Digest::MD5.hexdigest("#{private_token}:#{params[:login]}")
+ tip_exception(401, '401 Unauthorized') unless params[:sign].to_s == sign
+ user = User.find_by_login params[:login]
+ render_ok(data: {username: user.real_name, school: user.custom_department, login: user.login, phone: user.phone, mail: user.mail})
+ end
+
private
def load_user
@user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
@@ -731,7 +740,7 @@ class UsersController < ApplicationController
end
def sso_login
- if params[:login].present? && !current_user.logged? && params[:websiteName].present?
+ if params[:login].present? && !current_user.logged? && params[:websiteName].present? && request.referer.to_s.include?("gitlink.org.cn")
user = User.where("login = ?", "#{params[:login].presence}").first
# 已同步注册，直接登录
if user.present?
diff --git a/config/routes.rb b/config/routes.rb
index a25447641..75caa100d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -288,6 +288,7 @@ Rails.application.routes.draw do
post :following
post :unfollow
get :get_user_info
+ get :get_user_info_by_login
get :attachment_show
get :html_show
get :get_navigation_info
From 4318e9acfa3c03315dc21c1087321bdc43c7cdd8 Mon Sep 17 00:00:00 2001
From: xxq250
Date: Fri, 21 Jun 2024 10:45:54 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fixed=20releases=20download=E4=B8=8D?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/version_releases_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index d542fbb76..93aece8fc 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -3,7 +3,7 @@ class VersionReleasesController < ApplicationController
before_action :load_repository
before_action :set_user
before_action :require_login, except: [:index, :show]
- before_action :check_release_authorize, except: [:index, :show]
+ before_action :check_release_authorize, except: [:index, :show, :download]
before_action :find_version , only: [:show, :edit, :update, :destroy]
def index