Merge branch 'development'

lblod · Mar 30, 2022 · 51092d8 · 51092d8
2 parents 65dafd4 + b54c9f4
commit 51092d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/meetings/publish/notulen.js b/app/controllers/meetings/publish/notulen.js
@@ -95,8 +95,10 @@ export default class MeetingsPublishNotulenController extends Controller {
       this.notulen = rslt;
       this.errors = errors;
     }
-    const treatments = yield this.fetchTreatments.perform();
-    this.treatments = treatments;
+    if (this.status !== 'published') {
+      const treatments = yield this.fetchTreatments.perform();
+      this.treatments = treatments;
+    }
   }
 
   @task

diff --git a/app/templates/meetings/publish/notulen.hbs b/app/templates/meetings/publish/notulen.hbs
@@ -12,7 +12,11 @@
       {{#if this.loadNotulen.isIdle}}
         {{!-- cheating with status here, because signing doesn't affect preview --}}
         <PublicationPreview @title="Voorvertoning notulen" @status={{if (eq this.status "published") "published" "concept"}}>
-          {{html-safe this.zittingWrapper}}
+          {{#if (eq this.status 'published')}}
+            {{html-safe this.notulen.content}}
+          {{else}}
+            {{html-safe this.zittingWrapper}}
+          {{/if}}
           {{#if this.showPublicToggles}}
             {{#in-element this.containerElement}}
               <Signatures::Notulen::BehandelingenList