From e4af647a020be60cd8560e1ade561bd10050bfdc Mon Sep 17 00:00:00 2001 From: Dmytro Litvinov Date: Wed, 21 Aug 2024 17:23:06 +0300 Subject: [PATCH] Fix duplication of "Link" and "Unlink" options for HTMLField. (#679) * fix(settings): Remove duplication of Link and Unlink from HTMLField default settings * Update test.yml to exclude py38 from CMS 4.1 tests --------- Co-authored-by: Fabian Braun --- .github/workflows/test.yml | 8 ++++++++ .../static/djangocms_text_ckeditor/js/cms.ckeditor.js | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45d3d7bb3..de9366d56 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,6 +48,14 @@ jobs: requirements-file: dj50_cms41.txt - python-version: 3.8 requirements-file: dj50_cms41.txt + - python-version: 3.8 + requirements-file: dj41_cms41.txt + - python-version: 3.8 + requirements-file: dj40_cms41.txt + - python-version: 3.8 + requirements-file: dj32_cms41.txt + - python-version: 3.8 + requirements-file: dj42_cms41.txt - python-version: 3.9 requirements-file: dj50_cms41.txt - python-version: "3.10" diff --git a/djangocms_text_ckeditor/static/djangocms_text_ckeditor/js/cms.ckeditor.js b/djangocms_text_ckeditor/static/djangocms_text_ckeditor/js/cms.ckeditor.js index 6433eb3b4..3cb02dbc2 100644 --- a/djangocms_text_ckeditor/static/djangocms_text_ckeditor/js/cms.ckeditor.js +++ b/djangocms_text_ckeditor/static/djangocms_text_ckeditor/js/cms.ckeditor.js @@ -40,7 +40,6 @@ ['Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript', '-', 'RemoveFormat'], ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'], ['HorizontalRule'], - ['Link', 'Unlink'], ['NumberedList', 'BulletedList'], ['Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', '-', 'Table'], ['Source']