diff --git a/app/services/projects/set_attributes_service.rb b/app/services/projects/set_attributes_service.rb index a42e3ec8bf..3d3b630358 100644 --- a/app/services/projects/set_attributes_service.rb +++ b/app/services/projects/set_attributes_service.rb @@ -47,7 +47,7 @@ module Projects set_default_public(attribute_keys.include?('public')) set_default_module_names(attribute_keys.include?('enabled_module_names')) set_default_types(attribute_keys.include?('types') || attribute_keys.include?('type_ids')) - set_default_active_work_package_custom_fields + set_default_active_work_package_custom_fields(attribute_keys.include?('work_package_custom_fields')) end def set_default_public(provided) @@ -62,7 +62,9 @@ module Projects model.types = ::Type.default if !provided && model.types.empty? end - def set_default_active_work_package_custom_fields + def set_default_active_work_package_custom_fields(provided) + return if provided + model.work_package_custom_fields = WorkPackageCustomField.joins(:types).where(types: { id: model.type_ids }) end diff --git a/docs/installation-and-operations/bim-edition/README.md b/docs/installation-and-operations/bim-edition/README.md index 404b330638..1446ff7bad 100644 --- a/docs/installation-and-operations/bim-edition/README.md +++ b/docs/installation-and-operations/bim-edition/README.md @@ -81,11 +81,11 @@ theme. Go to _-> Administration -> Design_ and from the _Themes_ drop down menu choose _OpenProject BIM_. -### Docker +## Docker installation OpenProject BIM -#### OpenProject BIM Edition with Docker Compose +### OpenProject BIM edition with Docker Compose -in order to use BIM Edition inside a docker-compose OpenProject installation, in the `docker-compose.override.yml` file in `x-op-app` > `environment` add one line +In order to use BIM edition inside a [docker-compose OpenProject installation](../installation/docker/), in the `docker-compose.override.yml` file in `x-op-app` > `environment` add one line ```yml OPENPROJECT_EDITION: "bim" diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md index b9daa449af..b56dec8545 100644 --- a/docs/installation-and-operations/installation/docker/README.md +++ b/docs/installation-and-operations/installation/docker/README.md @@ -77,7 +77,7 @@ Please be aware that only those variables shall be edited which are documented a #### BIM Edition -In order to install or change to BIM inside a Docker environment, please navigate to the [Docker](../../bim-edition/#docker) paragraph at the BIM Edition documentation. +In order to install or change to BIM inside a Docker environment, please navigate to the [Docker Installation for OpenProject BIM](../../bim-edition/#docker-installation-openproject-bim) paragraph at the BIM edition documentation. ### Disabling services in the docker-compose file diff --git a/frontend/src/app/features/boards/new-board-modal/new-board-modal.html b/frontend/src/app/features/boards/new-board-modal/new-board-modal.html index bf157eb7b5..5716116870 100644 --- a/frontend/src/app/features/boards/new-board-modal/new-board-modal.html +++ b/frontend/src/app/features/boards/new-board-modal/new-board-modal.html @@ -30,7 +30,7 @@ -
+
-
+