Skip to content

Commit 21a4ea1

Browse files
committed
DAStaticFiles in .docx; curly bracket .docx adjustment; Word sidebar
1 parent f0b19fb commit 21a4ea1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+9104
-288
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## [0.2.97] - 2018-09-17
4+
### Added
5+
- Playground "Variables, etc." for the Word task pane.
6+
### Changed
7+
- It is no longer necessary to remove curly quotes from .docx Jinja2
8+
code. They will be converted to straight quotes before processing.
9+
### Fixed
10+
- Google Maps JavaScript was loading synchronously, which slowed down
11+
loading.
12+
- A `choices` list could not contain a list of numeric, boolean,
13+
or `NoneType` values.
14+
- `DAStaticFile`s could not be inserted into .docx templates.
15+
316
## [0.2.96] - 2018-09-12
417
### Added
518
- Integration between Microsoft OneDrive and the Playground.

CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
When contributing to this repository, please first discuss the change
44
you wish to make via issue, email, or any other method with the owner
5-
of this repository before making a change.
5+
of this repository before making a change. The best way to contribute
6+
a change is through a pull request.
67

78
## How to contribute to the documentation
89

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2017 Jonathan Pyle
3+
Copyright (c) 2015-2018 Jonathan Pyle
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

SECURITY.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## Reporting security issues
2+
3+
To report a security issue, email [email protected] and include the
4+
phrase "docassemble security" in the subject line.
5+
6+
You will receive a response indicating the next steps in handling your
7+
report. After the initial reply to your report, you will be kept
8+
informed of the progress towards a fix and full announcement, and you
9+
may be asked for additional information or guidance.
10+
11+
Report security bugs in third-party modules to the person or team
12+
maintaining the module.
13+
14+
To learn more about ensuring security in **docassemble**, please see
15+
the [Security] section in the [documentation].
16+
17+
[Security]: https://docassemble.org/docs/security.html
18+
[documentation]: https://docassemble.org/docs.html

docassemble_base/docassemble/base/core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,7 @@ def show(self, width=None):
23082308
if self.mimetype == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
23092309
return docassemble.base.file_docx.include_docx_template(self)
23102310
else:
2311-
return docassemble.base.file_docx.image_for_docx(self.number, docassemble.base.functions.this_thread.current_question, docassemble.base.functions.this_thread.docx_template, width=width)
2311+
return docassemble.base.file_docx.image_for_docx(docassemble.base.functions.DALocalFile(self.path()), docassemble.base.functions.this_thread.current_question, docassemble.base.functions.this_thread.docx_template, width=width)
23122312
else:
23132313
if width is not None:
23142314
return('[FILE ' + str(self.filename) + ', ' + str(width) + ']')

0 commit comments

Comments
 (0)