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

Small fixes for global search [SCI-10712]

Browse source
This commit is contained in:
Anton 2024-05-15 12:21:29 +02:00
parent cb35d5f16b
commit b3fe869c23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View file

@ -40,7 +40,6 @@ class ProjectsController < ApplicationController
end end
end end
def inventory_assigning_project_filter def inventory_assigning_project_filter
viewable_experiments = Experiment.viewable_by_user(current_user, current_team) viewable_experiments = Experiment.viewable_by_user(current_user, current_team)
assignable_my_modules = MyModule.repository_row_assignable_by_user(current_user) assignable_my_modules = MyModule.repository_row_assignable_by_user(current_user)
@ -260,7 +259,6 @@ class ProjectsController < ApplicationController
render json: { data: user_roles_collection(Project.new).map(&:reverse) } render json: { data: user_roles_collection(Project.new).map(&:reverse) }
end end
def actions_toolbar def actions_toolbar
render json: { render json: {
actions: actions:

20
app/javascript/vue/global_search/filters.vue
View file

@ -25,14 +25,17 @@
class="mb-6" class="mb-6"
@change="(v) => {this.updatedAt = v}" @change="(v) => {this.updatedAt = v}"
></DateFilter> ></DateFilter>
<div class="sci-label mb-2">{{ i18n.t('search.filters.by_team') }}</div> <template v-if="teams.length > 1">
<SelectDropdown :options="teams" <div class="sci-label mb-2">{{ i18n.t('search.filters.by_team') }}</div>
class="mb-6" <SelectDropdown :options="teams"
:with-checkboxes="true" class="mb-6"
:clearable="true" :with-checkboxes="true"
:multiple="true" :clearable="true"
:value="selectedTeams" :multiple="true"
@change="(v) => {selectedTeams = v}" /> :value="selectedTeams"
:placeholder="i18n.t('search.filters.by_team_placeholder')"
@change="(v) => {selectedTeams = v}" />
</template>
<div class="sci-label mb-2 flex items-center gap-2"> <div class="sci-label mb-2 flex items-center gap-2">
{{ i18n.t('search.filters.by_user') }} {{ i18n.t('search.filters.by_user') }}
<i class="sn-icon sn-icon-info" :title="i18n.t('search.filters.by_user_info')"></i> <i class="sn-icon sn-icon-info" :title="i18n.t('search.filters.by_user_info')"></i>
@ -45,6 +48,7 @@
:clearable="true" :clearable="true"
:with-checkboxes="true" :with-checkboxes="true"
:multiple="true" :multiple="true"
:placeholder="i18n.t('search.filters.by_user_placeholder')"
@change="(v) => {selectedUsers = v}" /> @change="(v) => {selectedUsers = v}" />
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<div class="sci-checkbox-container"> <div class="sci-checkbox-container">

4
config/locales/en.yml
View file

@ -472,7 +472,9 @@ en:
by_created_date: "Filter by created date" by_created_date: "Filter by created date"
by_updated_date: "Filter by updated date" by_updated_date: "Filter by updated date"
by_team: "Filter by team" by_team: "Filter by team"
by_team_placeholder: "Select team"
by_user: "Filter by user" by_user: "Filter by user"
by_user_placeholder: "Filter by user"
by_user_info: "The 'Filter by user' option will refine search results based on records where the selected user is the creator, modifier, or is assigned to the entry." by_user_info: "The 'Filter by user' option will refine search results based on records where the selected user is the creator, modifier, or is assigned to the entry."
include_archived: "Include Archived objects" include_archived: "Include Archived objects"
clear: "Clear filters" clear: "Clear filters"
@ -492,7 +494,7 @@ en:
index: index:
head_title: "Search" head_title: "Search"
page_title: "Search" page_title: "Search"
results_title_html: "Search Results for '%{query}'" results_title_html: "Search results for '%{query}'"
experiments: "Experiments" experiments: "Experiments"
tasks: "Tasks" tasks: "Tasks"
task_results: "Task results" task_results: "Task results"