Skip to content

Merging main back into development after the 4.0 release #3228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 5 commits into from
Oct 27, 2022
Merged

Merging main back into development after the 4.0 release #3228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
563b882
Bug #3203 - Fix for download plans docx being malformed if it has
Aug 12, 2022
08853aa
Merge pull request #3207 from DMPRoadmap/bug_3203_error_in_docx_xml_w…
briri Aug 30, 2022
9d5233b
Fixing seeding issue for French translation
Sean-Stilwell Sep 5, 2022
fd57e12
Merge pull request #3210 from Sean-Stilwell/master
briri Sep 6, 2022
c16f001
Merge pull request #3226 from DMPRoadmap/development
briri Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app/controllers/plan_exports_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ def show_text
def show_docx
# Using and optional locals_assign export_format
render docx: "#{file_name}.docx",
content: render_to_string(partial: 'shared/export/plan',
locals: { export_format: 'docx' })
content: clean_html_for_docx_creation(render_to_string(partial: 'shared/export/plan',
locals: { export_format: 'docx' }))
end

def show_pdf
Expand Down Expand Up @@ -143,4 +143,11 @@ def export_params
:custom_sections, :research_outputs,
formatting: [:font_face, :font_size, { margin: %i[top right bottom left] }])
end

# A method to deal with problematic text combinations
# in html that break docx creation by htmltoword gem.
def clean_html_for_docx_creation(html)
# Replaces single backslash \ with \\ with gsub.
html.gsub(/\\/, '\&\&')
end
end
8 changes: 6 additions & 2 deletions db/seeds.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,14 @@
description: '',
name: 'English (US)',
default_language: false},
{abbreviation: 'fr',
{abbreviation: 'fr-FR',
description: '',
name: 'Français',
name: 'Français (FR)',
default_language: false},
{abbreviation: 'fr-CA',
description: '',
name: 'Français (CA)',
default_language: false},
{abbreviation: 'de',
description: '',
name: 'Deutsch',
Expand Down