Skip to content
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

Jump to bottom

publishToConfluence: Fix comparision error for titles with leading/trailing white spaces #1246

Merged
merged 2 commits into from
Sep 12, 2023
Merged

publishToConfluence: Fix comparision error for titles with leading/trailing white spaces #1246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b69e558
Update asciidoc2confluence.groovy
MichaelRossner Sep 11, 2023
f532495
Merge branch 'ng' into ng
rdmueller Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion changelog.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ and this project tries to adhere to https://semver.org/spec/v2.0.0.html[Semantic
=== fixes

* https://github.com/docToolchain/docToolchain/issues/1209[#1209: generateSite: Problem with meta data parsing]
* https://github.com/docToolchain/docToolchain/pull/1217[#1217, #1214, #1216: dtcw.ps1 fix handling of java version]
* https://github.com/docToolchain/docToolchain/pull/1217[#1217, #1214, #1216: dtcw.ps1 fix handling of java version]
* https://github.com/docToolchain/docToolchain/issues/1215[#1215: dtcw.ps1 says dtc not installed after exceuting an install]
* https://github.com/docToolchain/docToolchain/issues/1192[#1192: exportExcel: unnecessary Rowspans break rendering of table]
* https://github.com/docToolchain/docToolchain/issues/1221[#1221: generateSite: beforeToc functionality broken]
* https://github.com/docToolchain/docToolchain/issues/1218[#1218: plantuml encoding issues]
* fixed curl command in manual
* https://github.com/docToolchain/docToolchain/issues/402[#402: publishToConfluence: Error rendering macro 'code']
* https://github.com/docToolchain/docToolchain/pull/1246[#1246: publishToConfluence: Fix comparision error for titles with leading/trailing white spaces]

=== added

Expand Down
2 changes: 2 additions & 0 deletions scripts/asciidoc2confluence.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,7 @@ def pushPages
pushPages = { pages, anchors, pageAnchors, labels ->
def editorVersion = determineEditorVersion()
pages.each { page ->
page.title = page.title.trim()
println page.title
def id = pushToConfluence page.title, page.body, page.parent, anchors, pageAnchors, labels, editorVersion
page.children*.parent = id
Expand Down Expand Up @@ -1119,6 +1120,7 @@ if(config.confluence.inputHtmlFolder) {
config.confluence.input.each { input ->
if(input.file) {
input.file = "${docDir}/${input.file}"
input.file = input.file.trim()

println "publish ${input.file}"

Expand Down
1 change: 1 addition & 0 deletions src/docs/10_about/30_community.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,6 @@ Please get in touch to update your entry or let us know if you have contributed
- https://github.com/johthor[Johannes Thorn]
- https://github.com/srotman[Stefan Rotman]
- https://github.com/klatka[Kevin Latka]
- https://github.com/MichaelRossner[Michael Roßner]

image::https://img.shields.io/github/contributors/doctoolchain/doctoolchain.svg[link=https://github.com/docToolchain/docToolchain/graphs/contributors]