scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix hound [SCI-10478]

Browse source
This commit is contained in:
sboursen-scinote 2024-04-03 01:04:20 +02:00
parent da19a79851
commit 31994b643a
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/search_controller.rb
View file

@ -16,7 +16,7 @@ class SearchController < ApplicationController
@project_search_count = fetch_cached_count(Project)
search_projects
if params[:preview] == 'true'
results = @project_results.take(4) || []
results = @project_results.take(4)
else
results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
end
@ -61,7 +61,7 @@ class SearchController < ApplicationController
@protocol_search_count = fetch_cached_count(Protocol)
search_protocols
results = if params[:preview] == 'true'
@protocol_results.take(4) || []
@protocol_results.take(4)
else
@protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
end
@ -69,9 +69,9 @@ class SearchController < ApplicationController
render json: results,
each_serializer: GlobalSearch::ProtocolSerializer,
meta: {
total: @search_count,
next_page: (results.next_page if results.respond_to?(:next_page))
}
total: @search_count,
next_page: (results.next_page if results.respond_to?(:next_page))
}
return
when 'label_templates'
return render json: [], meta: { disabled: true }, status: :ok unless LabelTemplate.enabled?
@ -79,7 +79,7 @@ class SearchController < ApplicationController
@label_template_search_count = fetch_cached_count(LabelTemplate)
search_label_templates
results = if params[:preview] == 'true'
@label_template_results.take(4) || []
@label_template_results.take(4)
else
@label_template_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
end
@ -87,9 +87,9 @@ class SearchController < ApplicationController
render json: results,
each_serializer: GlobalSearch::LabelTemplateSerializer,
meta: {
total: @search_count,
next_page: (results.next_page if results.respond_to?(:next_page))
}
total: @search_count,
next_page: (results.next_page if results.respond_to?(:next_page))
}
return
end

2
app/javascript/vue/global_search/groups/label_templates.vue
View file

@ -52,7 +52,7 @@ export default {
data() {
return {
group: 'label_templates',
enabled: false,
enabled: false
};
},
created() {

6
app/models/label_template.rb
View file

@ -25,11 +25,11 @@ class LabelTemplate < ApplicationRecord
end
def self.search(
user = nil,
include_archived = nil,
_user,
_include_archived,
query = nil,
page = 1,
current_team = nil,
_current_team = nil,
options = {}
)