Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:City-of-Helsinki/drupal-helfi-platf…
Browse files Browse the repository at this point in the history
…orm-config
oviag committed Feb 20, 2023
1 parent 468754e commit 431f138
Showing 54 changed files with 1,592 additions and 1,041 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
"drupal/config_rewrite": "^1.4",
"drupal/config_replace": "^2.0",
"drupal/content_lock": "^2.2",
"drupal/core-recommended": ">=9.3",
"drupal/crop": "^2.1",
"drupal/default_content": "^2.0.0-alpha2",
"drupal/diff": "^1.0",
@@ -61,7 +60,8 @@
"drupal/update_helper": "^2.0",
"drupal/view_unpublished": "^1.0",
"drupal/views_bulk_edit": "^2.7",
"drupal/views_bulk_operations": "^4.1"
"drupal/views_bulk_operations": "^4.1",
"ext-curl": "*"
},
"conflict": {
"drupal/core-recommended": "<9.5",
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ dependencies:
- editor
- linkit
- media
- token_filter
name: HTML
format: full_html
weight: 0
@@ -84,13 +83,6 @@ filters:
default_view_mode: default
allowed_view_modes: { }
allowed_media_types: { }
token_filter:
id: token_filter
provider: token_filter
status: true
weight: -47
settings:
replace_empty: '1'
helfi_link_converter:
id: helfi_link_converter
provider: helfi_api_base
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ dependencies:
- editor
- linkit
- media
- token_filter
name: Minimal
format: minimal
weight: 0
@@ -84,13 +83,6 @@ filters:
default_view_mode: default
allowed_view_modes: { }
allowed_media_types: { }
token_filter:
id: token_filter
provider: token_filter
status: true
weight: -43
settings:
replace_empty: '1'
helfi_link_converter:
id: helfi_link_converter
provider: helfi_api_base
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ permissions:
- 'create paragraph library item'
- 'create remote entities'
- 'create remote_video media'
- 'create soundcloud media'
- 'create terms in keywords'
- 'create url aliases'
- 'delete all revisions'
@@ -53,7 +52,6 @@ permissions:
- 'delete any media'
- 'delete any page content'
- 'delete any remote_video media'
- 'delete any soundcloud media'
- 'delete content translations'
- 'delete landing_page revisions'
- 'delete media'
@@ -62,7 +60,6 @@ permissions:
- 'delete own landing_page content'
- 'delete own page content'
- 'delete own remote_video media'
- 'delete own soundcloud media'
- 'delete page revisions'
- 'delete remote entities'
- 'delete terms in keywords'
@@ -71,13 +68,11 @@ permissions:
- 'edit any landing_page content'
- 'edit any page content'
- 'edit any remote_video media'
- 'edit any soundcloud media'
- 'edit own file media'
- 'edit own image media'
- 'edit own landing_page content'
- 'edit own page content'
- 'edit own remote_video media'
- 'edit own soundcloud media'
- 'edit paragraph library item'
- 'edit remote entities'
- 'edit terms in keywords'
@@ -98,7 +93,6 @@ permissions:
- 'translate menu_link_content'
- 'translate page node'
- 'translate remote_video media'
- 'translate soundcloud media'
- 'update any media'
- 'update content translations'
- 'update media'
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ permissions:
- 'create page content'
- 'create paragraph library item'
- 'create remote_video media'
- 'create soundcloud media'
- 'create terms in keywords'
- 'create url aliases'
- 'delete media'
@@ -34,19 +33,16 @@ permissions:
- 'delete own landing_page content'
- 'delete own page content'
- 'delete own remote_video media'
- 'delete own soundcloud media'
- 'edit any file media'
- 'edit any image media'
- 'edit any landing_page content'
- 'edit any page content'
- 'edit any remote_video media'
- 'edit any soundcloud media'
- 'edit own file media'
- 'edit own image media'
- 'edit own landing_page content'
- 'edit own page content'
- 'edit own remote_video media'
- 'edit own soundcloud media'
- 'edit paragraph library item'
- 'edit terms in keywords'
- 'revert landing_page revisions'
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ permissions:
- 'create paragraph library item'
- 'create remote entities'
- 'create remote_video media'
- 'create soundcloud media'
- 'create terms in keywords'
- 'create url aliases'
- 'delete any file media'
@@ -40,7 +39,6 @@ permissions:
- 'delete any media'
- 'delete any page content'
- 'delete any remote_video media'
- 'delete any soundcloud media'
- 'delete content translations'
- 'delete landing_page revisions'
- 'delete media'
@@ -49,7 +47,6 @@ permissions:
- 'delete own landing_page content'
- 'delete own page content'
- 'delete own remote_video media'
- 'delete own soundcloud media'
- 'delete page revisions'
- 'delete remote entities'
- 'delete terms in keywords'
@@ -58,13 +55,11 @@ permissions:
- 'edit any landing_page content'
- 'edit any page content'
- 'edit any remote_video media'
- 'edit any soundcloud media'
- 'edit own file media'
- 'edit own image media'
- 'edit own landing_page content'
- 'edit own page content'
- 'edit own remote_video media'
- 'edit own soundcloud media'
- 'edit paragraph library item'
- 'edit remote entities'
- 'edit terms in keywords'
@@ -83,7 +78,6 @@ permissions:
- 'translate menu_link_content'
- 'translate page node'
- 'translate remote_video media'
- 'translate soundcloud media'
- 'update any media'
- 'update content translations'
- 'update media'
1 change: 0 additions & 1 deletion helfi_features/helfi_content/helfi_content.info.yml
Original file line number Diff line number Diff line change
@@ -40,7 +40,6 @@ dependencies:
- 'select2:select2'
- 'select2_icon:select2_icon'
- 'social_media:social_media'
- 'token_filter:token_filter'
- 'update_helper:update_helper'
package: HELfi
'interface translation project': helfi_content
24 changes: 24 additions & 0 deletions helfi_features/helfi_content/helfi_content.install
Original file line number Diff line number Diff line change
@@ -1003,3 +1003,27 @@ function helfi_content_update_9039() {
// Output logged messages to related channel of update execution.
return $updateHelper->logger()->output();
}

/**
* Uninstall token_filter and aet modules.
*/
function helfi_content_update_9040() : void {
if (\Drupal::moduleHandler()->moduleExists('token_filter')) {
$formatters = \Drupal::entityTypeManager()
->getStorage('filter_format')
->loadMultiple();

/** @var \Drupal\filter\Entity\FilterFormat $format */
foreach ($formatters as $format) {
$format->setFilterConfig('token_filter', [
'status' => FALSE,
])
->save();
}

Drupal::service('module_installer')->uninstall([
'token_filter',
'aet',
]);
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 431f138

Please sign in to comment.