Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drupal Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Drupal Environment
Commits
d8df9c4a
Commit
d8df9c4a
authored
4 months ago
by
danielspeicher
Browse files
Options
Downloads
Patches
Plain Diff
git commit -m 'Issue #3352586: Parameter to disable machine name in terms overview'
parent
fc2ff4dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!359
Merging develop into main
Pipeline
#1359722
passed
4 months ago
Stage: build
Stage: validate
Stage: release
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/d10/33525862-2.diff
+0
-56
0 additions, 56 deletions
patches/d10/33525862-2.diff
with
0 additions
and
56 deletions
patches/d10/33525862-2.diff
+
0
−
56
View file @
d8df9c4a
diff --git a/composer.json b/composer.json
index 41b19f5fe9afe25dabdac641c11baaa94f2ba8ab..bda38d5015851179c99ece6f46a67312a36ccae2 100755
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,6 @@
"source": "https://git.drupalcode.org/project/taxonomy_machine_name"
},
"require": {
- "drupal/core": "^9.4 || ^10"
+ "drupal/core": "^9.4 || ^10 || ^11"
}
}
diff --git a/config/install/taxonomy_machine_name.settings.yml b/config/install/taxonomy_machine_name.settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4593ad4f74557433d1b3a98bed866d0917c3a142
...
...
@@ -17,20 +5,6 @@ index 0000000000000000000000000000000000000000..4593ad4f74557433d1b3a98bed866d09
+++ b/config/install/taxonomy_machine_name.settings.yml
@@ -0,0 +1 @@
+hide_machine_name_in_terms_overview: 0
diff --git a/modules/search_api_taxonomy_machine_name/search_api_taxonomy_machine_name.info.yml b/modules/search_api_taxonomy_machine_name/search_api_taxonomy_machine_name.info.yml
index c30e70172377b0de1c213087f6e4e73ae02b2c95..a67abac92a6f11288cb3d78addf68d6e07963d22 100644
--- a/modules/search_api_taxonomy_machine_name/search_api_taxonomy_machine_name.info.yml
+++ b/modules/search_api_taxonomy_machine_name/search_api_taxonomy_machine_name.info.yml
@@ -2,8 +2,7 @@
name: Search API Taxonomy Machine Name
description: Search API integration for the Taxonomy Machine Name module
type: module
package: Other
-core: 8.x
-core_version_requirement: ^8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
dependencies:
- taxonomy_machine_name:taxonomy_machine_name
diff --git a/src/Form/Settings.php b/src/Form/Settings.php
new file mode 100644
index 0000000000000000000000000000000000000000..0476b6b19e4e8053c0fb73742c1e8e75cd531cc8
...
...
@@ -91,36 +65,6 @@ index 0000000000000000000000000000000000000000..0476b6b19e4e8053c0fb73742c1e8e75
+ }
+
+}
diff --git a/taxonomy_machine_name.info.yml b/taxonomy_machine_name.info.yml
index 1ec84a8daba43059a61f8345c987e8524f05e206..533d41372b4be7ec1388ef03967c9c0a9eca4872 100644
--- a/taxonomy_machine_name.info.yml
+++ b/taxonomy_machine_name.info.yml
@@ -2,7 +2,7 @@
name: Taxonomy Machine Name
description: Provides a new property to store machine name for taxonomy terms.
type: module
package: Other
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10 || ^11
dependencies:
- drupal:taxonomy
diff --git a/taxonomy_machine_name.install b/taxonomy_machine_name.install
index 55607499a02cd6eac59956ed1fcfd6924d7f3662..a3a996e3832482276919faa576c8f08e4a872aa7 100644
--- a/taxonomy_machine_name.install
+++ b/taxonomy_machine_name.install
@@ -43,10 +43,10 @@
function taxonomy_machine_name_update_8001(array &$sandbox = NULL) {
/**
* Update machine names for existing terms, usable both in batch and update.
*
- * @param array $context
+ * @param array|DrushBatchContext $context
* The $context parameter in updates, called $context in Batch API.
*/
-function taxonomy_machine_name_update_all_terms(array &$context) {
+function taxonomy_machine_name_update_all_terms(&$context) {
$sandbox = &$context['sandbox'];
if (empty($sandbox['tids'])) {
// Size of the batch to process.
diff --git a/taxonomy_machine_name.links.menu.yml b/taxonomy_machine_name.links.menu.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d06f5425102a95f63c60439aba59e77e52636051
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment