Fix rendering of license_expression fields in admin #63

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Jun 27, 2024 · 3ee264d · 3ee264d
1 parent 4d58976
commit 3ee264d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/component_catalog/forms.py b/component_catalog/forms.py
@@ -949,6 +949,12 @@ class ComponentAdminForm(
     SetKeywordsChoicesFormMixin,
     DataspacedAdminForm,
 ):
+    expression_field_names = [
+        "license_expression",
+        "declared_license_expression",
+        "other_license_expression",
+    ]
+
     keywords = JSONListField(
         required=False,
         widget=AdminAwesompleteInputWidget(attrs=autocomplete_placeholder),
@@ -983,6 +989,12 @@ class PackageAdminForm(
     SetKeywordsChoicesFormMixin,
     DataspacedAdminForm,
 ):
+    expression_field_names = [
+        "license_expression",
+        "declared_license_expression",
+        "other_license_expression",
+    ]
+
     keywords = JSONListField(
         required=False,
         widget=AdminAwesompleteInputWidget(attrs=autocomplete_placeholder),

diff --git a/component_catalog/widgets.py b/component_catalog/widgets.py
@@ -26,4 +26,4 @@ def render(self, name, value, *args, **kwargs):
                 self.object_instance.policy_from_primary_license,
             )
 
-        return rendered + value_from_license
+        return format_html("{}{}", rendered, value_from_license)
diff --git a/dejacode/static/css/dejacode_admin.css b/dejacode/static/css/dejacode_admin.css
@@ -201,15 +201,16 @@ p.url .vURLField {margin-top: 5px; width: 710px;}
 fieldset.grp-module p.selector-filter label {display: none;}
 
 /* Fix for the visibility of the awesomplete license expression builder choices */
-fieldset.grp-module div.license_expression,
-fieldset.grp-module div.from_expression,
-fieldset.grp-module div.to_expression,
+fieldset.grp-module div[class*="_expression"],
 fieldset.grp-module div.primary_language,
 fieldset.grp-module div.keywords,
 fieldset.grp-module div.feature {overflow: visible;}
 body.mass_update div.awesomplete {display: block;}
 div.awesomplete > ul {z-index: 1000 !important;}
 
+/* License expression fields */
+textarea#id_declared_license_expression, textarea#id_other_license_expression {height: 60px;}
+
 /* License choices */
 code.license_expression {border: 1px solid #ccc; background-color: #EEE; color: black; padding: 2px 4px; border-radius: 3px;}
 button.submit-inline-button {font-weight: bold; padding: 0 5px; width: auto; background-color: #40A7C9; border: 1px solid #2b8aab;}