You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/07/16 16:47:16 UTC
[23/50] [abbrv] incubator-nifi git commit: NIFI-694: - Ensuring
bulletins are not lost when updating a reporting task.
NIFI-694:
- Ensuring bulletins are not lost when updating a reporting task.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c3dff409
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c3dff409
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c3dff409
Branch: refs/heads/master
Commit: c3dff409024d00208c68323ad1989bd2b93b7c0c
Parents: 4fd1e94
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Jul 2 10:22:42 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jul 2 10:22:42 2015 -0400
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-reporting-task.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c3dff409/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
index 998213e..da78e82 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js
@@ -177,7 +177,10 @@ nf.ReportingTask = (function () {
// get the table and update the row accordingly
var reportingTaskGrid = $('#reporting-tasks-table').data('gridInstance');
var reportingTaskData = reportingTaskGrid.getData();
- reportingTaskData.updateItem(reportingTask.id, reportingTask);
+ var currentReportingTask = reportingTaskData.getItemById(reportingTask.id);
+ reportingTaskData.updateItem(reportingTask.id, $.extend({
+ bulletins: currentReportingTask.bulletins
+ }, reportingTask));
};
/**