issue 20 and 22 fix

1modm · Dec 6, 2021 · 2076fd3 · 2076fd3
1 parent 5f08bcd
commit 2076fd3
Show file tree

Hide file tree

Showing 9 changed files with 1,079 additions and 549 deletions.
diff --git a/app/config/Dockerfile b/app/config/Dockerfile
@@ -47,4 +47,4 @@ RUN wget ${EISVOGEL_REPO}/v${EISVOGEL_VERSION}/eisvogel.tex -O ${TEMPLATES_DIR}/
 WORKDIR /opt/petereport
 
 COPY Pipfile ./
-RUN pipenv install --system --deploy --ignore-pipfile
+RUN pipenv install --system --deploy --ignore-pipfile
diff --git a/app/petereport/static/cvsscalc31.js b/app/petereport/static/cvsscalc31.js
diff --git a/app/petereport/static/cvsscalc31_helptext.js b/app/petereport/static/cvsscalc31_helptext.js
diff --git a/app/preport/templates/findings/finding_add.html b/app/preport/templates/findings/finding_add.html
diff --git a/app/preport/templates/findings/template_add.html b/app/preport/templates/findings/template_add.html
diff --git a/app/preport/templates/home/footer.html b/app/preport/templates/home/footer.html
@@ -1,6 +1,6 @@
   <footer class="main-footer">
     <div class="float-right d-none d-sm-block">
-      <b>Version</b> 0.3
+      <b>Version</b> 0.4
     </div>
     <strong>Copyright &copy; 2021 <a href="https://github.com/1modm/petereport">PeTeReport</a>.</strong> All rights reserved.
   </footer>

diff --git a/app/preport/templates/tpl/pdf/pdf_header.yaml b/app/preport/templates/tpl/pdf/pdf_header.yaml
@@ -10,7 +10,7 @@ titlepage: true
 titlepage-color: "{{titlepagecolor}}"
 titlepage-text-color: "{{titlepagetextcolor}}"
 titlepage-rule-color: "{{titlerulecolor}}"
-titlepage-rule-height: {{titlepageruleheight}}
+titlepage-rule-height: "{{titlepageruleheight}}"
 book: false
 toc-own-page: true
 code-block-font-size: \scriptsize

diff --git a/app/preport/views.py b/app/preport/views.py
@@ -949,7 +949,7 @@ def reportdownloadjupyter(request,pk):
     # FINDINGS
     for finding in DB_finding_query:
         counter_finding += 1
-        template_appendix_in_finding = template_attacktree_in_finding = ''
+        template_appendix_in_finding = template_attacktree_in_finding = template_attacktree = ''
 
         if finding.severity == 'Critical':
             counter_finding_critical += 1 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,4 +28,4 @@ services:
       - .:/opt/petereport
     expose:
       - 8000
-    restart: unless-stopped
+    restart: unless-stopped