scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-11 00:41:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2278 from urbanrotnik/ur-sci-4161-global-search-for-new-column-types

Browse source 
Add search for statuses, numbers [SCI-4161]
This commit is contained in:
Urban Rotnik 2020-01-07 11:46:11 +01:00 • committed by GitHub
commit cedaaa7ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/searchable_model.rb
View file

@ -44,7 +44,7 @@ module SearchableModel
"CAST(#{a} AS TEXT) #{like} :t#{i} OR " "CAST(#{a} AS TEXT) #{like} :t#{i} OR "
else else
col = options[:at_search].to_s == 'true' ? "lower(#{a})": a col = options[:at_search].to_s == 'true' ? "lower(#{a})": a
"(trim_html_tags(#{col})) #{like} :t#{i} OR " "(trim_html_tags((#{col})::text)) #{like} :t#{i} OR "
end end
end end
).join[0..-5] ).join[0..-5]
@ -86,7 +86,7 @@ module SearchableModel
if a == 'repository_rows.id' if a == 'repository_rows.id'
"CAST(#{a} AS TEXT) #{like} :t#{i} OR " "CAST(#{a} AS TEXT) #{like} :t#{i} OR "
else else
"(trim_html_tags(#{a})) #{like} :t#{i} OR " "(trim_html_tags((#{a})::text)) #{like} :t#{i} OR "
end end
end end
).join[0..-5] ).join[0..-5]

2
app/models/repository_number_value.rb
View file

@ -14,7 +14,7 @@ class RepositoryNumberValue < ApplicationRecord
SORTABLE_VALUE_INCLUDE = :repository_number_value SORTABLE_VALUE_INCLUDE = :repository_number_value
def formatted def formatted
data data.to_s
end end
def data_changed?(new_data) def data_changed?(new_data)

2
app/views/search/results/_repositories.html.erb
View file

@ -24,7 +24,7 @@
<% repository_row.repository_cells.each do |cell| %> <% repository_row.repository_cells.each do |cell| %>
<span> <span>
<%=t "search.index.repositories.custom_column", column: cell.repository_column.name %> <%=t "search.index.repositories.custom_column", column: cell.repository_column.name %>
<%= highlight cell.value.data, search_query.strip.split(/\s+/) %> <%= highlight cell.value.formatted, search_query.strip.split(/\s+/) %>
</span> </span>
<br> <br>
<% end %> <% end %>

4
config/initializers/extends.rb
View file

@ -62,14 +62,18 @@ class Extends
# Extra attributes used for search in repositories, text columns # Extra attributes used for search in repositories, text columns
# are only supported # are only supported
REPOSITORY_EXTRA_SEARCH_ATTR = ['repository_text_values.data', REPOSITORY_EXTRA_SEARCH_ATTR = ['repository_text_values.data',
'repository_number_values.data',
'repository_list_items.data', 'repository_list_items.data',
'repository_checklist_items.data', 'repository_checklist_items.data',
'repository_status_items.status',
'active_storage_blobs.filename'] 'active_storage_blobs.filename']
# Array of includes used in search query for repository rows # Array of includes used in search query for repository rows
REPOSITORY_SEARCH_INCLUDES = [:repository_text_value, REPOSITORY_SEARCH_INCLUDES = [:repository_text_value,
:repository_number_value,
repository_list_value: :repository_list_item, repository_list_value: :repository_list_item,
repository_checklist_value: :repository_checklist_items, repository_checklist_value: :repository_checklist_items,
repository_status_value: :repository_status_item,
repository_asset_value: { asset: { file_attachment: :blob } }] repository_asset_value: { asset: { file_attachment: :blob } }]
# List of implemented core API versions # List of implemented core API versions