yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pre_trustie_server' into trustie_server

This commit is contained in:
xxq250 2024-06-21 15:42:58 +08:00
parent 59907c371d b4c5991bc8
commit 6d593f786b
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/version_releases_controller.rb
View File

@ -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

7
app/queries/admins/glcc_examine_material.rb
View File

@ -13,11 +13,8 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all
# term
term = params[:term] || [1,2]
if term.present?
materials = materials.where(term: term)
end
#year
materials = materials.where(term: params[:term]) if params[:term].present?
#year
year = if params[:date]
params[:date][:year]
end

4
app/views/admins/glcc_pr_check/index.html.erb
View File

@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
<div class="form-group mr-2">
<label for="status">考核选项：</label>
<% status_options = [['中期考核',1], ['结项考核', 2]] %>
<% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
</div>
@ -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 %>
<div class="form-group mr-2">
<label for="status">　　请选择考核选项：</label>
<% status_options = [['中期考核',1], ['结项考核', 2]] %>
<% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
</div>

2
app/views/settings/show.json.jbuilder
View File

@ -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)