Merge pull request #160 from City-of-Helsinki/UHF-9150-import-more-on…

…tology-words UHF-9150: modify schoolyear settings and TPR ontologyword details name
City-of-Helsinki · Nov 16, 2023 · afed5db · afed5db
2 parents 42eed9b + 012a0aa
commit afed5db
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 480 deletions.
diff --git a/modules/helfi_school_addons/config/schema/helfi_school_addons.schema.yml b/modules/helfi_school_addons/config/schema/helfi_school_addons.schema.yml
diff --git a/modules/helfi_school_addons/helfi_school_addons.info.yml b/modules/helfi_school_addons/helfi_school_addons.info.yml
@@ -1,8 +1,5 @@
 name: HELfi School addons
 type: module
-description: Adds school specific features. Currently used with the high school search.
+description: This module should be removed after it's disabled. Adds school specific features.
 package: HELfi
 core_version_requirement: ^9 || ^10
-configure: helfi_school_addons.admin_form
-dependencies:
-  - helfi_tpr:helfi_tpr
diff --git a/modules/helfi_school_addons/helfi_school_addons.links.menu.yml b/modules/helfi_school_addons/helfi_school_addons.links.menu.yml
diff --git a/modules/helfi_school_addons/helfi_school_addons.module b/modules/helfi_school_addons/helfi_school_addons.module
diff --git a/modules/helfi_school_addons/helfi_school_addons.permissions.yml b/modules/helfi_school_addons/helfi_school_addons.permissions.yml
diff --git a/modules/helfi_school_addons/helfi_school_addons.routing.yml b/modules/helfi_school_addons/helfi_school_addons.routing.yml
diff --git a/modules/helfi_school_addons/src/Form/SchoolSettingsForm.php b/modules/helfi_school_addons/src/Form/SchoolSettingsForm.php
diff --git a/modules/helfi_school_addons/src/Plugin/views/filter/EducationalMission.php b/modules/helfi_school_addons/src/Plugin/views/filter/EducationalMission.php
diff --git a/modules/helfi_school_addons/src/Plugin/views/filter/Emphasis.php b/modules/helfi_school_addons/src/Plugin/views/filter/Emphasis.php
diff --git a/modules/helfi_school_addons/src/Plugin/views/filter/SchoolDetailsBase.php b/modules/helfi_school_addons/src/Plugin/views/filter/SchoolDetailsBase.php