floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request '管理员 org界面新增对CLA的筛选' (#78) from KingChan/forgeplus:chenjing into standalone_develop

This commit is contained in:
KingChan 2023-06-26 09:31:18 +08:00
parent f9a02c3bd6 bd3a0d1cab
commit c2d0f040e5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/queries/admins/organization_query.rb
View File

@ -9,6 +9,8 @@ class Admins::OrganizationQuery < ApplicationQuery
def call def call
orgs = Organization.all orgs = Organization.all
orgs = orgs.where(enabling_cla: params[:enabling_cla]) if params[:enabling_cla].present?
# 关键字检索 # 关键字检索
keyword = params[:keyword].to_s.strip.presence keyword = params[:keyword].to_s.strip.presence
if keyword if keyword

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

@ -5,6 +5,10 @@
<%= form_tag(admins_organizations_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> <%= form_tag(admins_organizations_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: 'login/昵称') %> <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'login/昵称') %>
<label for="user_enabling_cla">
是否签署CLA
</label>
<%= check_box_tag("enabling_cla", true, false, id: "user_enabling_cla", style: 'margin-left: 2px;') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<% end %> <% end %>