Repository: incubator-nifi
Updated Branches:
  refs/heads/NIFI-475 eb5912711 -> 74844d741


NIFI-475:
- Only providing the option to go to the service if the dialog is originating 
from the canvas (not for instance the summary page).

Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e213866d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e213866d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e213866d

Branch: refs/heads/NIFI-475
Commit: e213866d2bd6a63fe06d41ac6f5915d244f1c19c
Parents: eb59127
Author: Matt Gilman <[email protected]>
Authored: Tue Apr 7 13:18:29 2015 -0400
Committer: Matt Gilman <[email protected]>
Committed: Tue Apr 7 13:18:29 2015 -0400

----------------------------------------------------------------------
 .../main/webapp/js/jquery/propertytable/jquery.propertytable.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e213866d/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 c2b947d..09d1a74 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
@@ -1015,9 +1015,10 @@
             
             var identifiesControllerService = 
nf.Common.isDefinedAndNotNull(propertyDescriptor.identifiesControllerService);
             var isConfigured = 
nf.Common.isDefinedAndNotNull(dataContext.value);
+            var isOnCanvas = nf.Common.isDefinedAndNotNull(nf.Canvas);
             
-            // check for allowable values which will drive which editor to use
-            if (identifiesControllerService && isConfigured) {
+            // check to see if we should provide a button for going to a 
controller service
+            if (identifiesControllerService && isConfigured && isOnCanvas) {
                 // ensure the configured value is referencing a valid service
                 $.each(propertyDescriptor.allowableValues, function (_, 
allowableValue) {
                     if (allowableValue.value === dataContext.value) {

Reply via email to