Browse Source

Merge pull request #14757 from afishbeck/desdlUnboundMsg

HPCC-25634 Improve navigation pane for empty dynamic ESP bindings

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 years ago
parent
commit
b54a45c834
2 changed files with 10 additions and 1 deletions
  1. 2 0
      esp/platform/espprotocol.cpp
  2. 8 1
      esp/xslt/nav.xsl

+ 2 - 0
esp/platform/espprotocol.cpp

@@ -476,6 +476,8 @@ IPropertyTree *CEspBinding::addNavException(IPropertyTree &folder, const char *m
 
 void CEspBinding::getNavigationData(IEspContext &context, IPropertyTree & data)
 {
+    if (isDynamicBinding() && !isBound())
+        return;
     IEspWsdlSections *wsdl = dynamic_cast<IEspWsdlSections *>(this);
     if (wsdl)
     {

+ 8 - 1
esp/xslt/nav.xsl

@@ -62,7 +62,14 @@
                         <tr>
                             <td>
                                 <table border="0" cellspacing="0" cellpadding="0" id="table2">
-                                    <xsl:apply-templates select="*"/>
+                                  <xsl:choose>
+                                    <xsl:when test="*">
+                                        <xsl:apply-templates select="*"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;no service found</xsl:text>
+                                    </xsl:otherwise>
+                                  </xsl:choose>
                                 </table>
                             </td>
                         </tr>