diff --git a/app/controllers/api/v1/projects/compare_controller.rb b/app/controllers/api/v1/projects/compare_controller.rb
index 2593399d1..8a40ba519 100644
--- a/app/controllers/api/v1/projects/compare_controller.rb
+++ b/app/controllers/api/v1/projects/compare_controller.rb
@@ -20,9 +20,9 @@ class Api::V1::Projects::CompareController < Api::V1::BaseController
def gitea_compare_files(base, head)
if params[:filepath].present?
- $gitea_hat_client.get_repos_compare_files_by_owner_repo_baseref_headref_filepath(@project&.owner&.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), CGI.escape(params[:filepath]), {query: {token: current_user&.gitea_token}})
+ $gitea_hat_client.get_repos_compare_by_owner_repo_baseref_headref(@project&.owner&.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), {query: {token: current_user&.gitea_token, isFiles: true, filepath: params[:filepath]}})
else
- $gitea_hat_client.get_repos_compare_files_by_owner_repo_baseref_headref(@project&.owner&.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), {query: {page:page,limit:limit,token: current_user&.gitea_token}})
+ $gitea_hat_client.get_repos_compare_by_owner_repo_baseref_headref(@project&.owner&.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), {query: {page:page,limit:limit,token: current_user&.gitea_token, isFiles: true}})
end
end
diff --git a/app/controllers/concerns/api/pull_helper.rb b/app/controllers/concerns/api/pull_helper.rb
index e186cd6f2..ab72a0080 100644
--- a/app/controllers/concerns/api/pull_helper.rb
+++ b/app/controllers/concerns/api/pull_helper.rb
@@ -3,7 +3,7 @@ module Api::PullHelper
def load_pull_request
pull_request_id = params[:pull_id] || params[:id]
- @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || PullRequest.find_by_id(pull_request_id)
+ @pull_request = @project.pull_requests.where(gitea_number: pull_request_id).where.not(id: pull_request_id).take || @project.pull_requests.find_by_id(pull_request_id)
@issue = @pull_request&.issue
if @pull_request
logger.info "###########pull_request founded"
diff --git a/app/views/admins/shared/_sidebar_201.html.erb b/app/views/admins/shared/_sidebar_201.html.erb
new file mode 100644
index 000000000..1d0856c3b
--- /dev/null
+++ b/app/views/admins/shared/_sidebar_201.html.erb
@@ -0,0 +1,44 @@
+<% sidebar_collapse = request.cookies['admin_sidebar_collapse'].to_s == 'true' %>
+
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 91a77bf65..a05dfe952 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -16,7 +16,7 @@
<% body_class = [params[:controller].gsub(/\//, '-').gsub('_', '-'), params[:action], 'page'].join('-') %>
- <%= render partial: 'admins/shared/sidebar' %>
+ <%= render partial: "admins/shared/#{EduSetting.get("admin_sidebar").present?? EduSetting.get("admin_sidebar") : "sidebar"}" %>