diff options
| author | Wyatt Allen <wyatta@google.com> | 2018-08-17 17:12:52 -0700 |
|---|---|---|
| committer | Wyatt Allen <wyatta@google.com> | 2018-08-17 17:17:27 -0700 |
| commit | 4738623fcbdf078d5b66e29d7ea3a920cec12e50 (patch) | |
| tree | 1ac46163921b417eeeca6476525146d04e6de6f2 /resources | |
| parent | 5d9813454a81deb815bef80e64f5bb3aee62e38b (diff) | |
Fix index template null check
Because assetsPath is an optional template parameter, it should be
checked for truthiness rather than equality with an empty string. This
caused the run-server.sh tool to fail when rendering the index and it
caused the Java server to incorrectly emit the string "null".
Change-Id: I596d8c88ccf43b7c2fea954110d3b7c5f995dfe3
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy index 9590f15bb3..f401735da4 100644 --- a/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy +++ b/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy @@ -38,7 +38,7 @@ {if $deprecateGwtUi}window.DEPRECATE_GWT_UI = true;{/if} {if $versionInfo}window.VERSION_INFO = '{$versionInfo}';{/if} {if $staticResourcePath != ''}window.STATIC_RESOURCE_PATH = '{$staticResourcePath}';{/if} - {if $assetsPath != ''}window.ASSETS_PATH = '{$assetsPath}';{/if} + {if $assetsPath}window.ASSETS_PATH = '{$assetsPath}';{/if} </script>{\n} {if $faviconPath} |