diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c960766f9..7c1797705 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -40,7 +40,6 @@ class ProjectsController < ApplicationController end end - def inventory_assigning_project_filter viewable_experiments = Experiment.viewable_by_user(current_user, current_team) 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) } end - def actions_toolbar render json: { actions: diff --git a/app/javascript/vue/global_search/filters.vue b/app/javascript/vue/global_search/filters.vue index 1a5edad37..8c8458281 100644 --- a/app/javascript/vue/global_search/filters.vue +++ b/app/javascript/vue/global_search/filters.vue @@ -25,14 +25,17 @@ class="mb-6" @change="(v) => {this.updatedAt = v}" > -
{{ i18n.t('search.filters.by_team') }}
- +
{{ i18n.t('search.filters.by_user') }} @@ -45,6 +48,7 @@ :clearable="true" :with-checkboxes="true" :multiple="true" + :placeholder="i18n.t('search.filters.by_user_placeholder')" @change="(v) => {selectedUsers = v}" />
diff --git a/config/locales/en.yml b/config/locales/en.yml index 75ae9f16c..4107329c2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,7 +474,9 @@ en: by_created_date: "Filter by created date" by_updated_date: "Filter by updated date" by_team: "Filter by team" + by_team_placeholder: "Select team" 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." include_archived: "Include Archived objects" clear: "Clear filters" @@ -494,7 +496,7 @@ en: index: head_title: "Search" page_title: "Search" - results_title_html: "Search Results for '%{query}'" + results_title_html: "Search results for '%{query}'" experiments: "Experiments" tasks: "Tasks" task_results: "Task results"