diff --git a/config/initializers/feature_decisions.rb b/config/initializers/feature_decisions.rb index 36b159a2e930..c3457acaacb9 100644 --- a/config/initializers/feature_decisions.rb +++ b/config/initializers/feature_decisions.rb @@ -55,7 +55,3 @@ OpenProject::FeatureDecisions.add :wiki_enhancements, description: "Enables Wiki enhancements, such as the Wikis tab and XWiki integration.", force_active: true - -OpenProject::FeatureDecisions.add :departments, - description: "Enables the management of departments within the organization." - diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb index 247f21c467ba..280d1cb244ee 100644 --- a/config/initializers/menus.rb +++ b/config/initializers/menus.rb @@ -361,7 +361,7 @@ menu.push :departments, { controller: "/admin/departments" }, - if: ->(_) { User.current.admin? && OpenProject::FeatureDecisions.departments_active? }, + if: ->(_) { User.current.admin? }, caption: :label_departments, parent: :users_and_permissions diff --git a/config/routes.rb b/config/routes.rb index f0ca5cf5243d..e1f69b32ed3c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -849,8 +849,7 @@ end resources :departments, - only: %i[index show edit update destroy], - constraints: lambda { |_request| OpenProject::FeatureDecisions.departments_active? } do + only: %i[index show edit update destroy] do member do get :new_user post :add_user diff --git a/spec/controllers/admin/departments_controller_spec.rb b/spec/controllers/admin/departments_controller_spec.rb index dbe2154cfa4f..d18dbe90d554 100644 --- a/spec/controllers/admin/departments_controller_spec.rb +++ b/spec/controllers/admin/departments_controller_spec.rb @@ -30,7 +30,7 @@ require "spec_helper" -RSpec.describe Admin::DepartmentsController, with_flag: { departments: true } do +RSpec.describe Admin::DepartmentsController do before do login_as current_user end diff --git a/spec/features/admin/departments_spec.rb b/spec/features/admin/departments_spec.rb index ed3794e38ef7..1c7f72d5f394 100644 --- a/spec/features/admin/departments_spec.rb +++ b/spec/features/admin/departments_spec.rb @@ -32,8 +32,7 @@ require "support/pages/admin/departments" RSpec.describe "Departments admin", - :js, - with_flag: { departments: true } do + :js do shared_let(:admin) { create(:admin) } let(:departments_page) { Pages::Admin::Departments.new }