Using extra accessors

oarepo · Feb 26, 2024 · a44dcb0 · a44dcb0
1 parent 7514527
commit a44dcb0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/oarepo_ui/resources/templating/data.py b/oarepo_ui/resources/templating/data.py
@@ -83,7 +83,9 @@ def _as_array(self):
 
     @property
     def _is_empty(self):
-        return not bool(self.__data)
+        if not self.__data:
+            return False
+        return True
 
     @property
     def _has_value(self):

diff --git a/oarepo_ui/templates/components/datafields/IField.jinja b/oarepo_ui/templates/components/datafields/IField.jinja
@@ -1,6 +1,6 @@
 {# def d=True, label=None, placeholder=None, keep=false, field_class=None #}
 
-{%- if not d._is_empty or keep -%}
+{%- if d._has_value or keep -%}
     <IBaseField label={label or d._ui_label} field_class={field_class}>
         {%- if content is not none and ((content is not string) or content.strip()) -%}
             {{ content }}

diff --git a/oarepo_ui/templates/components/datafields/INonEmpty.jinja b/oarepo_ui/templates/components/datafields/INonEmpty.jinja
@@ -1,5 +1,5 @@
 {# def d #}
 
-{% if array(d, remove_empty=True) | length -%}
+{% if d._has_value -%}
     {{ content }}
 {%- endif %}