From 4d0974c5fa79b6551f47a78c96a26a5801b2c530 Mon Sep 17 00:00:00 2001 From: acholyn Date: Wed, 21 Aug 2024 15:54:15 +0100 Subject: [PATCH 1/5] enabling ap crit in CKE on OT details form if there are items --- src/rard/research/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rard/research/forms.py b/src/rard/research/forms.py index a0d56d159..0ef738ee1 100644 --- a/src/rard/research/forms.py +++ b/src/rard/research/forms.py @@ -572,9 +572,9 @@ def __init__(self, *args, **kwargs): if original_text: self.fields["content"].widget.attrs["data-object"] = original_text.pk # Only enable apparatus criticus editing if object exists - self.fields["content"].widget.attrs[ - "class" - ] = "enableApparatusCriticus enableCKEditor" + self.fields["content"].widget.attrs["class"] = "enableCKEditor" + if original_text.apparatus_criticus_items.count() > 0: + self.fields["content"].widget.attrs["class"] = "enableApparatusCriticus" def clean_reference_order(self): # Reference order needs to be stored as a string with leading 0s such From 3ceabb686c36437fa7fc8cfdc0723d9818087074 Mon Sep 17 00:00:00 2001 From: acholyn Date: Wed, 21 Aug 2024 16:18:35 +0100 Subject: [PATCH 2/5] fixing invocation --- src/rard/research/forms.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rard/research/forms.py b/src/rard/research/forms.py index 0ef738ee1..911d70da8 100644 --- a/src/rard/research/forms.py +++ b/src/rard/research/forms.py @@ -621,7 +621,8 @@ def __init__(self, *args, **kwargs): original_text = kwargs.get("instance", None) if original_text and original_text.pk: original_text.update_content_mentions() - + if original_text.apparatus_criticus_items.count() > 0: + self.fields["content"].widget.attrs["class"] = "enableApparatusCriticus" if original_text and original_text.reference_order: original_text.reference_order = ( original_text.remove_reference_order_padding() @@ -633,9 +634,7 @@ def __init__(self, *args, **kwargs): # of an existing instance to be blank and assign a newly-created # work to the original text instance in the view self.set_citing_work_required(True) - self.fields["content"].widget.attrs[ - "class" - ] = "enableApparatusCriticus enableCKEditor" + self.fields["content"].widget.attrs["class"] = "enableCKEditor" def set_citing_work_required(self, required): # to allow set/reset required fields dynically in the view From c506fc75fbc00d9805e6eae9ae2f57402b33f854 Mon Sep 17 00:00:00 2001 From: acholyn Date: Wed, 8 Jan 2025 11:50:04 +0000 Subject: [PATCH 3/5] using += for the app crit class --- src/rard/research/forms.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rard/research/forms.py b/src/rard/research/forms.py index 911d70da8..bf393f5f3 100644 --- a/src/rard/research/forms.py +++ b/src/rard/research/forms.py @@ -574,7 +574,9 @@ def __init__(self, *args, **kwargs): # Only enable apparatus criticus editing if object exists self.fields["content"].widget.attrs["class"] = "enableCKEditor" if original_text.apparatus_criticus_items.count() > 0: - self.fields["content"].widget.attrs["class"] = "enableApparatusCriticus" + self.fields["content"].widget.attrs[ + "class" + ] += "enableApparatusCriticus" def clean_reference_order(self): # Reference order needs to be stored as a string with leading 0s such @@ -622,7 +624,9 @@ def __init__(self, *args, **kwargs): if original_text and original_text.pk: original_text.update_content_mentions() if original_text.apparatus_criticus_items.count() > 0: - self.fields["content"].widget.attrs["class"] = "enableApparatusCriticus" + self.fields["content"].widget.attrs[ + "class" + ] += "enableApparatusCriticus" if original_text and original_text.reference_order: original_text.reference_order = ( original_text.remove_reference_order_padding() @@ -634,7 +638,7 @@ def __init__(self, *args, **kwargs): # of an existing instance to be blank and assign a newly-created # work to the original text instance in the view self.set_citing_work_required(True) - self.fields["content"].widget.attrs["class"] = "enableCKEditor" + self.fields["content"].widget.attrs["class"] += "enableCKEditor" def set_citing_work_required(self, required): # to allow set/reset required fields dynically in the view From f1e2a87ceb639c1b86094bd3f7e4390c392d5c18 Mon Sep 17 00:00:00 2001 From: acholyn Date: Thu, 9 Jan 2025 15:56:52 +0000 Subject: [PATCH 4/5] moving app crit count call + adding spaces --- src/rard/research/forms.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/rard/research/forms.py b/src/rard/research/forms.py index bf393f5f3..c99d7cb7c 100644 --- a/src/rard/research/forms.py +++ b/src/rard/research/forms.py @@ -576,7 +576,7 @@ def __init__(self, *args, **kwargs): if original_text.apparatus_criticus_items.count() > 0: self.fields["content"].widget.attrs[ "class" - ] += "enableApparatusCriticus" + ] += " enableApparatusCriticus" def clean_reference_order(self): # Reference order needs to be stored as a string with leading 0s such @@ -623,10 +623,7 @@ def __init__(self, *args, **kwargs): original_text = kwargs.get("instance", None) if original_text and original_text.pk: original_text.update_content_mentions() - if original_text.apparatus_criticus_items.count() > 0: - self.fields["content"].widget.attrs[ - "class" - ] += "enableApparatusCriticus" + if original_text and original_text.reference_order: original_text.reference_order = ( original_text.remove_reference_order_padding() @@ -638,7 +635,9 @@ def __init__(self, *args, **kwargs): # of an existing instance to be blank and assign a newly-created # work to the original text instance in the view self.set_citing_work_required(True) - self.fields["content"].widget.attrs["class"] += "enableCKEditor" + self.fields["content"].widget.attrs["class"] = "enableCKEditor" + if original_text.apparatus_criticus_items.count() > 0: + self.fields["content"].widget.attrs["class"] += " enableApparatusCriticus" def set_citing_work_required(self, required): # to allow set/reset required fields dynically in the view From 7dade422d7142fd0136aa30e48723aaf404ba99d Mon Sep 17 00:00:00 2001 From: acholyn Date: Thu, 9 Jan 2025 16:18:17 +0000 Subject: [PATCH 5/5] changing conditional slightly --- src/rard/research/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rard/research/forms.py b/src/rard/research/forms.py index c99d7cb7c..4db5da4b2 100644 --- a/src/rard/research/forms.py +++ b/src/rard/research/forms.py @@ -636,7 +636,7 @@ def __init__(self, *args, **kwargs): # work to the original text instance in the view self.set_citing_work_required(True) self.fields["content"].widget.attrs["class"] = "enableCKEditor" - if original_text.apparatus_criticus_items.count() > 0: + if original_text and original_text.apparatus_criticus_items.count() > 0: self.fields["content"].widget.attrs["class"] += " enableApparatusCriticus" def set_citing_work_required(self, required):