Skip to content

Commit

Permalink
Merge pull request #991 from HL7/FixBindingTableOrder
Browse files Browse the repository at this point in the history
Fix binding table order
  • Loading branch information
grahamegrieve authored Nov 29, 2024
2 parents a75f907 + f13711a commit e281944
Showing 1 changed file with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,17 @@ else if (!tx.hasDescription())
if (brd.suffix != null) {
b.append(brd.suffix);
}
if (tx.hasValueSet()) {
b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
if (link != null) {
if (Utilities.isAbsoluteUrlLinkable(link)) {
b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");
} else {
b.append("<div>from "+Utilities.escapeXml(link)+"</div>");
}
}
} else {
}
AdditionalBindingsRenderer abr = new AdditionalBindingsRenderer(igp, corePath, sd, path, gen, this, sdr);
if (tx.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) {
abr.seeMaxBinding(ToolingExtensions.getExtension(tx, ToolingExtensions.EXT_MAX_VALUESET));
Expand All @@ -826,17 +837,6 @@ else if (!tx.hasDescription())
abr.render(x.getChildNodes(), true);
b.append(new XhtmlComposer(true, true).compose(x));
}
if (tx.hasValueSet()) {
b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
if (link != null) {
if (Utilities.isAbsoluteUrlLinkable(link)) {
b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");
} else {
b.append("<div>from "+Utilities.escapeXml(link)+"</div>");
}
}
} else {
}
b.append("</td>");
b.append("</tr>\r\n");
}
Expand Down

0 comments on commit e281944

Please sign in to comment.