Browse Source

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

pull/338/head
KingChan 3 years ago
parent
commit
c2d0f040e5
2 changed files with 6 additions and 0 deletions
  1. +2
    -0
      app/queries/admins/organization_query.rb
  2. +4
    -0
      app/views/admins/organizations/index.html.erb

+ 2
- 0
app/queries/admins/organization_query.rb View File

@@ -9,6 +9,8 @@ class Admins::OrganizationQuery < ApplicationQuery

def call
orgs = Organization.all

orgs = orgs.where(enabling_cla: params[:enabling_cla]) if params[:enabling_cla].present?
# 关键字检索
keyword = params[:keyword].to_s.strip.presence
if keyword


+ 4
- 0
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 %>

<%= 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': '搜索中...') %>
<% end %>


Loading…
Cancel
Save