You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/07/13 20:45:47 UTC
nifi git commit: NIFI-2254: - Addressing accessing URI on the wrong
object.
Repository: nifi
Updated Branches:
refs/heads/master 6b87e1ea8 -> a989f6b9c
NIFI-2254: - Addressing accessing URI on the wrong object.
This closes #644
Signed-off-by: jpercivall <jo...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a989f6b9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a989f6b9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a989f6b9
Branch: refs/heads/master
Commit: a989f6b9c27a60e38f11518c529266d90688478d
Parents: 6b87e1e
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Jul 13 14:13:42 2016 -0400
Committer: jpercivall <jo...@yahoo.com>
Committed: Wed Jul 13 16:18:09 2016 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js | 3 ++-
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js | 3 ++-
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js | 3 ++-
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js | 3 ++-
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js | 3 ++-
.../src/main/webapp/js/nf/canvas/nf-processor-configuration.js | 2 +-
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js | 3 ++-
.../src/main/webapp/js/nf/canvas/nf-remote-process-group.js | 3 ++-
8 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
index eeefa38..5107ccf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection.js
@@ -1727,9 +1727,10 @@ nf.Connection = (function () {
*/
reload: function (connection) {
if (connectionMap.has(connection.id)) {
+ var connectionEntity = connectionMap.get(connection.id);
return $.ajax({
type: 'GET',
- url: connection.uri,
+ url: connectionEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.Connection.set(response);
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
index efda58c..937806f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-funnel.js
@@ -281,9 +281,10 @@ nf.Funnel = (function () {
*/
reload: function (funnel) {
if (funnelMap.has(funnel.id)) {
+ var funnelEntity = funnelMap.get(funnel.id);
return $.ajax({
type: 'GET',
- url: funnel.uri,
+ url: funnelEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.Funnel.set(response);
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
index bde87d5..890985d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-label.js
@@ -461,9 +461,10 @@ nf.Label = (function () {
*/
reload: function (label) {
if (labelMap.has(label.id)) {
+ var labelEntity = labelMap.get(label.id);
return $.ajax({
type: 'GET',
- url: label.uri,
+ url: labelEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.Label.set(response);
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
index 4505aa4..b09efce 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
@@ -606,9 +606,10 @@ nf.Port = (function () {
*/
reload: function (port) {
if (portMap.has(port.id)) {
+ var portEntity = portMap.get(port.id);
return $.ajax({
type: 'GET',
- url: port.uri,
+ url: portEntity.uri,
dataType: 'json'
}).done(function (response) {
if (nf.Common.isDefinedAndNotNull(response.inputPort)) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
index fc96c01..ac0f89e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
@@ -1088,9 +1088,10 @@ nf.ProcessGroup = (function () {
*/
reload: function (processGroup) {
if (processGroupMap.has(processGroup.id)) {
+ var processGroupEntity = processGroupMap.get(processGroup.id);
return $.ajax({
type: 'GET',
- url: processGroup.uri,
+ url: processGroupEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.ProcessGroup.set(response);
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
index 120f05c..3201a5a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
@@ -433,7 +433,7 @@ nf.ProcessorConfiguration = (function () {
return $.ajax({
type: 'PUT',
data: JSON.stringify(updatedProcessor),
- url: processor.uri,
+ url: d.uri,
dataType: 'json',
contentType: 'application/json'
}).done(function (response) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
index 1f133ce..169318c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
@@ -863,9 +863,10 @@ nf.Processor = (function () {
*/
reload: function (processor) {
if (processorMap.has(processor.id)) {
+ var processorEntity = processorMap.get(processor.id);
return $.ajax({
type: 'GET',
- url: processor.uri,
+ url: processorEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.Processor.set(response);
http://git-wip-us.apache.org/repos/asf/nifi/blob/a989f6b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
index b053761..7983bbb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
@@ -934,9 +934,10 @@ nf.RemoteProcessGroup = (function () {
*/
reload: function (remoteProcessGroup) {
if (remoteProcessGroupMap.has(remoteProcessGroup.id)) {
+ var remoteProcessGroupEntity = remoteProcessGroupMap.get(remoteProcessGroup.id);
return $.ajax({
type: 'GET',
- url: remoteProcessGroup.uri,
+ url: remoteProcessGroupEntity.uri,
dataType: 'json'
}).done(function (response) {
nf.RemoteProcessGroup.set(response);