Fix template error when the report contains invalidated samples (sena…

…ite#129) * Use the getter to get the retest sample * Changelog updated
nepaliemr · Jan 22, 2023 · 54ee2a4 · 54ee2a4
1 parent e0e4208
commit 54ee2a4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -1,6 +1,7 @@
 2.4.0 (unreleased)
 ------------------
 
+- #129 Fix template error when the report contains invalidated samples
 - #128 Fix AttributeError 'Verificators' on model.verifiers call
 - #127 Support textarea change events for report options
 

diff --git a/src/senaite/impress/templates/reports/Default.pt b/src/senaite/impress/templates/reports/Default.pt
@@ -260,7 +260,7 @@
       <div class="w-100 mb-2">
         <div class="alert alert-danger" tal:condition="model/is_invalid">
           <div i18n:translate="">This Analysis Request has been invalidated due to erroneously published results</div>
-          <tal:invalidreport tal:define="child model/Retest"
+          <tal:invalidreport tal:define="child python:model.getRetest()"
                              tal:condition="child">
             <span i18n:translate="">This Analysis request has been replaced by</span>
             <a tal:attributes="href child/absolute_url"

diff --git a/src/senaite/impress/templates/reports/MultiDefault.pt b/src/senaite/impress/templates/reports/MultiDefault.pt
@@ -265,7 +265,7 @@
           <div class="alert alert-danger" tal:condition="model/is_invalid">
             <h2 class="alert-heading"><span tal:replace="model/getId"/></h2>
             <div i18n:translate="">This Analysis Request has been invalidated due to erroneously published results</div>
-            <tal:invalidreport tal:define="child model/Retest"
+            <tal:invalidreport tal:define="child python:model.getRetest()"
                                tal:condition="child">
               <span i18n:translate="">This Analysis request has been replaced by</span>
               <a tal:attributes="href child/absolute_url"

diff --git a/src/senaite/impress/templates/reports/MultiDefaultByColumn.pt b/src/senaite/impress/templates/reports/MultiDefaultByColumn.pt
@@ -313,7 +313,7 @@
           <div class="alert alert-danger" tal:condition="model/is_invalid">
             <h2 class="alert-heading"><span tal:replace="model/getId"/></h2>
             <div i18n:translate="">This Analysis Request has been invalidated due to erroneously published results</div>
-            <tal:invalidreport tal:define="child model/Retest"
+            <tal:invalidreport tal:define="child python:model.getRetest()"
                                tal:condition="child">
               <span i18n:translate="">This Analysis request has been replaced by</span>
               <a tal:attributes="href child/absolute_url"