Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Replace tabs with tab_nav

Oliver Günther0cb9d86c1255
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f1181becdf6..907362da191 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -34,6 +34,8 @@ class SearchController < ApplicationController
before_action :load_and_authorize_in_optional_project,
:prepare_tokens
+ helper_method :search_types, :search_params
+
LIMIT = 10
def index
@@ -137,28 +139,30 @@ class SearchController < ApplicationController
end
def search_types
- types = Redmine::Search.available_search_types.dup
+ @search_types ||= begin
+ types = Redmine::Search.available_search_types.dup
+
+ if projects_to_search.is_a? Project
+ # don't search projects
+ types.delete("projects")
+ # only show what the user is allowed to view
+ types = types.select { |o| User.current.allowed_in_project?(:"view_#{o}", projects_to_search) }
+ end
- if projects_to_search.is_a? Project
- # don't search projects
- types.delete("projects")
- # only show what the user is allowed to view
- types = types.select { |o| User.current.allowed_in_project?(:"view_#{o}", projects_to_search) }
+ types
end
-
- types
end
def search_classes
scope = search_types & search_params.keys
scope = if scope.empty?
- search_types
- elsif scope & ["work_packages"] == scope
- []
- else
- scope
- end
+ search_types
+ elsif scope & ["work_packages"] == scope
+ []
+ else
+ scope
+ end
scope.index_with { |s| scope_class(s) }
end
diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb
index 0c6627954cf..58764f3c7d4 100644
--- a/app/models/permitted_params.rb
+++ b/app/models/permitted_params.rb
@@ -604,12 +604,7 @@ class PermittedParams
offset
previous
scope
- work_packages
- news
- changesets
- wiki_pages
- messages
- projects
+ filter
submit
),
status: %i(
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 4932da1a133..dd6ced4de04 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
title =
- case @search_params[:scope]
+ case search_params[:scope]
when "all"
t("global_search.title.all_projects", search_term: @question)
when "current_project"
@@ -48,18 +48,32 @@ See COPYRIGHT and LICENSE files for more details.
end
header.with_title { title }
-
header.with_breadcrumbs(
[
({ href: project_overview_path(@project.id), text: @project.name } if @project),
title
].compact
)
+
+ header.with_tab_nav(label: nil) do |tab_nav|
+ (search_types + ["all"]).each do |name|
+ tab_nav.with_tab(
+ selected: search_params[:filter] == name,
+ href: search_path(
+ {
+ filter: name,
+ q: @question,
+ scope: search_params[:scope]
+ }.compact
+ )
+ ) do |t|
+ t.with_text { OpenProject::GlobalSearch.tab_name(name) }
+ end
+ end
+ end
end
%>
-<opce-global-search-tabs></opce-global-search-tabs>
-
<% if params[:work_packages].present? %>
<opce-global-search-work-packages></opce-global-search-work-packages>
<% else %>
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 062be16f389..9422ceeb90b 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -179,7 +179,6 @@ import { NoResultsComponent } from 'core-app/shared/components/no-results/no-res
import {
OpNonWorkingDaysListComponent,
} from 'core-app/shared/components/op-non-working-days-list/op-non-working-days-list.component';
-import { GlobalSearchTitleComponent } from 'core-app/core/global_search/title/global-search-title.component';
import { PersistentToggleComponent } from 'core-app/shared/components/persistent-toggle/persistent-toggle.component';
import { TypeFormConfigurationComponent } from 'core-app/features/admin/types/type-form-configuration.component';
import { ToastsContainerComponent } from 'core-app/shared/components/toaster/toasts-container.component';
@@ -188,7 +187,6 @@ import {
CustomDateActionAdminComponent,
} from 'core-app/features/work-packages/components/wp-custom-actions/date-action/custom-date-action-admin.component';
import { HomescreenNewFeaturesBlockComponent } from 'core-app/features/homescreen/blocks/new-features.component';
-import { GlobalSearchTabsComponent } from 'core-app/core/global_search/tabs/global-search-tabs.component';
import {
ZenModeButtonComponent,
} from 'core-app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component';
@@ -432,14 +430,12 @@ export class OpenProjectModule implements DoBootstrap {
registerCustomElement('opce-no-results', NoResultsComponent, { injector });
registerCustomElement('opce-non-working-days-list', OpNonWorkingDaysListComponent, { injector });
registerCustomElement('opce-main-menu-resizer', MainMenuResizerComponent, { injector });
- registerCustomElement('opce-global-search-title', GlobalSearchTitleComponent, { injector });
registerCustomElement('opce-persistent-toggle', PersistentToggleComponent, { injector });
registerCustomElement('opce-admin-type-form-configuration', TypeFormConfigurationComponent, { injector });
registerCustomElement('opce-toasts-container', ToastsContainerComponent, { injector });
registerCustomElement('opce-global-search-work-packages', GlobalSearchWorkPackagesComponent, { injector });
registerCustomElement('opce-custom-date-action-admin', CustomDateActionAdminComponent, { injector });
registerCustomElement('opce-homescreen-new-features-block', HomescreenNewFeaturesBlockComponent, { injector });
- registerCustomElement('opce-global-search-tabs', GlobalSearchTabsComponent, { injector });
registerCustomElement('opce-zen-mode-toggle-button', ZenModeButtonComponent, { injector });
registerCustomElement('opce-colors-autocompleter', ColorsAutocompleterComponent, { injector });
}
diff --git a/frontend/src/app/core/global_search/openproject-global-search.module.ts b/frontend/src/app/core/global_search/openproject-global-search.module.ts
index c1fba2d5d0e..f8b8ebbfd56 100644
--- a/frontend/src/app/core/global_search/openproject-global-search.module.ts
+++ b/frontend/src/app/core/global_search/openproject-global-search.module.ts
@@ -30,7 +30,6 @@ import { Injector, NgModule } from '@angular/core';
import { OpenprojectWorkPackagesModule } from 'core-app/features/work-packages/openproject-work-packages.module';
import { GlobalSearchInputComponent } from 'core-app/core/global_search/input/global-search-input.component';
import { GlobalSearchWorkPackagesComponent } from 'core-app/core/global_search/global-search-work-packages.component';
-import { GlobalSearchTabsComponent } from 'core-app/core/global_search/tabs/global-search-tabs.component';
import { GlobalSearchService } from 'core-app/core/global_search/services/global-search.service';
import {
OpenprojectAutocompleterModule,
@@ -51,7 +50,6 @@ import { RecentItemsService } from 'core-app/core/recent-items.service';
declarations: [
GlobalSearchInputComponent,
GlobalSearchWorkPackagesComponent,
- GlobalSearchTabsComponent,
],
})
export class OpenprojectGlobalSearchModule {