Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Mark Payne 2015-01-14 07:07:20 -05:00
parent eaca6a29d3 80793ccbb8
commit 67dee2e33b
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
View File

@ -167,7 +167,7 @@ nf.Actions = (function () {
var uri = selectionData.component.targetUri; var uri = selectionData.component.targetUri;
if (!nf.Common.isBlank(uri)) { if (!nf.Common.isBlank(uri)) {
window.open(encodeURI(uri + '/nifi')); window.open(encodeURI(uri));
} else { } else {
nf.Dialog.showOkDialog({ nf.Dialog.showOkDialog({
dialogContent: 'No target URI defined.' dialogContent: 'No target URI defined.'

23
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
View File

@ -364,6 +364,20 @@ nf.ProcessorConfiguration = (function () {
} }
}; };
/**
* Reloads the outgoing connections for the specified processor.
*
* @param {object} processor
*/
var reloadProcessorConnections = function (processor) {
var connections = nf.Connection.getComponentConnections(processor.id);
$.each(connections, function (_, connection) {
if (connection.source.id === processor.id) {
nf.Connection.reload(connection);
}
});
};
return { return {
/** /**
* Initializes the processor properties tab. * Initializes the processor properties tab.
@ -601,9 +615,12 @@ nf.ProcessorConfiguration = (function () {
// update the revision // update the revision
nf.Client.setRevision(response.revision); nf.Client.setRevision(response.revision);
// set the new processor state // set the new processor state based on the response
nf.Processor.set(response.processor); nf.Processor.set(response.processor);
// reload the processor's outgoing connections
reloadProcessorConnections(processor);
// close the details panel // close the details panel
$('#processor-configuration').modal('hide'); $('#processor-configuration').modal('hide');
} }
@ -632,7 +649,11 @@ nf.ProcessorConfiguration = (function () {
// show the custom ui // show the custom ui
nf.CustomProcessorUi.showCustomUi($('#processor-id').text(), processor.config.customUiUrl, true).done(function () { nf.CustomProcessorUi.showCustomUi($('#processor-id').text(), processor.config.customUiUrl, true).done(function () {
// once the custom ui is closed, reload the processor
nf.Processor.reload(processor); nf.Processor.reload(processor);
// and reload the processor's outgoing connections
reloadProcessorConnections(processor);
}); });
}; };

10
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
View File

@ -53,6 +53,11 @@ nf.Shell = (function () {
* @argument {boolean} canUndock Whether or not the shell is undockable * @argument {boolean} canUndock Whether or not the shell is undockable
*/ */
showPage: function (uri, canUndock) { showPage: function (uri, canUndock) {
// if the context menu is on this page, attempt to close
if (nf.Common.isDefinedAndNotNull(nf.ContextMenu)) {
nf.ContextMenu.hide();
}
return $.Deferred(function (deferred) { return $.Deferred(function (deferred) {
var shell = $('#shell'); var shell = $('#shell');
@ -108,6 +113,11 @@ nf.Shell = (function () {
* @argument {string} domId The id of the element to show in the shell * @argument {string} domId The id of the element to show in the shell
*/ */
showContent: function (domId) { showContent: function (domId) {
// if the context menu is on this page, attempt to close
if (nf.Common.isDefinedAndNotNull(nf.ContextMenu)) {
nf.ContextMenu.hide();
}
return $.Deferred(function (deferred) { return $.Deferred(function (deferred) {
var content = $(domId); var content = $(domId);
if (content.length) { if (content.length) {