From ea605aae941cbd64cd3d7adb731230b2864257d1 Mon Sep 17 00:00:00 2001 From: Alexander Watzinger Date: Tue, 16 Jan 2024 14:14:57 +0100 Subject: [PATCH] Fix for #2155: enabling disabled checkboxes again --- config/default.py | 2 +- install/upgrade/upgrade.md | 3 +++ openatlas/forms/base_manager.py | 1 - openatlas/forms/manager.py | 1 - openatlas/views/changelog.py | 3 +++ openatlas/views/vocabs.py | 2 -- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/default.py b/config/default.py index 039ad5331..a23e99a57 100644 --- a/config/default.py +++ b/config/default.py @@ -3,7 +3,7 @@ from config.database_versions import DATABASE_VERSIONS -VERSION = '8.0.0' +VERSION = '8.0.1' DATABASE_VERSION = DATABASE_VERSIONS[0] DEMO_MODE = False # If activated some options are disabled, login is prefilled DEBUG = False diff --git a/install/upgrade/upgrade.md b/install/upgrade/upgrade.md index 1e03deebe..a9da64474 100644 --- a/install/upgrade/upgrade.md +++ b/install/upgrade/upgrade.md @@ -18,6 +18,9 @@ then run the database upgrade script, then restart Apache: sudo python3 install/upgrade/database_upgrade.py sudo service apache2 restart +### 8.0.0 to 8.0.1 +A code base update (e.g. with git pull) and a webserver restart is sufficient. + ### 7.17.x to 8.0.0 This is a major upgrade which utilizes newer versions of underlying software. Please consult the install.md about installation. In case you are using a diff --git a/openatlas/forms/base_manager.py b/openatlas/forms/base_manager.py index f8158e5bf..e36d02905 100644 --- a/openatlas/forms/base_manager.py +++ b/openatlas/forms/base_manager.py @@ -455,7 +455,6 @@ def additional_fields(self) -> dict[str, Any]: return { 'classes': SelectMultipleField( _('classes'), - render_kw={'disabled': True}, description=_('tooltip hierarchy forms'), choices=Type.get_class_choices(self.entity), option_widget=widgets.CheckboxInput(), diff --git a/openatlas/forms/manager.py b/openatlas/forms/manager.py index a649a0fce..3be8556e5 100644 --- a/openatlas/forms/manager.py +++ b/openatlas/forms/manager.py @@ -537,7 +537,6 @@ def additional_fields(self) -> dict[str, Any]: precision_id: TreeField(precision_id), 'classes': SelectMultipleField( _('classes'), - render_kw={'disabled': True}, choices=choices, option_widget=widgets.CheckboxInput(), widget=widgets.ListWidget(prefix_label=False)) diff --git a/openatlas/views/changelog.py b/openatlas/views/changelog.py index 1be9417a6..807928835 100644 --- a/openatlas/views/changelog.py +++ b/openatlas/views/changelog.py @@ -15,6 +15,9 @@ def index_changelog() -> str: versions = { + '8.0.1': ['2024-01-16', { + 'fix': { + '2155': 'Checkboxes in checkbox groups are disabled'}}], '8.0.0': ['2024-01-01', { 'feature': { '2038': 'Update OpenAtlas software to Debian bookworm', diff --git a/openatlas/views/vocabs.py b/openatlas/views/vocabs.py index 868dcd2f7..96f4ecadd 100644 --- a/openatlas/views/vocabs.py +++ b/openatlas/views/vocabs.py @@ -126,14 +126,12 @@ def vocabulary_import_view(category: str, id_: str) -> Union[str, Response]: class ImportVocabsHierarchyForm(FlaskForm): concepts = SelectMultipleField( _('top concepts') if category == 'hierarchy' else _('groups'), - render_kw={'disabled': True}, choices=fetch_top_concept_details(id_) if category == 'hierarchy' else fetch_top_group_details(id_), option_widget=widgets.CheckboxInput(), widget=widgets.ListWidget(prefix_label=False)) classes = SelectMultipleField( _('classes'), - render_kw={'disabled': True}, description=_('tooltip hierarchy forms'), choices=Type.get_class_choices(), option_widget=widgets.CheckboxInput(),