Repository: incubator-nifi Updated Branches: refs/heads/NIFI-475 74844d741 -> 629436294
NIFI-475: - Including the controller service description in the inline controller service dialog. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/62943629 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/62943629 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/62943629 Branch: refs/heads/NIFI-475 Commit: 629436294993e6e455d7d54c0bf7a2c864946d2f Parents: 74844d7 Author: Matt Gilman <[email protected]> Authored: Wed Apr 8 07:33:53 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Apr 8 07:33:53 2015 -0400 ---------------------------------------------------------------------- .../main/webapp/js/jquery/propertytable/jquery.propertytable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62943629/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js index 09d1a74..7a3c141 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js @@ -800,7 +800,8 @@ $.each(response.controllerServiceTypes, function (i, controllerServiceType) { options.push({ text: nf.Common.substringAfterLast(controllerServiceType.type, '.'), - value: controllerServiceType.type + value: controllerServiceType.type, + description: nf.Common.escapeHtml(controllerServiceType.description) }); });
