|
@@ -1353,10 +1353,6 @@
|
|
|
snippet.jobs.length = 0;
|
|
snippet.jobs.length = 0;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- if (self.schedulerViewModel) {
|
|
|
|
|
- self.saveScheduler();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
$.post("/notebook/api/notebook/save", {
|
|
$.post("/notebook/api/notebook/save", {
|
|
|
"notebook": ko.mapping.toJSON(cp, NOTEBOOK_MAPPING),
|
|
"notebook": ko.mapping.toJSON(cp, NOTEBOOK_MAPPING),
|
|
|
"editorMode": vm.editorMode
|
|
"editorMode": vm.editorMode
|
|
@@ -1379,8 +1375,10 @@
|
|
|
if (! self.schedulerViewModel) {
|
|
if (! self.schedulerViewModel) {
|
|
|
self.loadScheduler();
|
|
self.loadScheduler();
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ self.saveScheduler();
|
|
|
self.refreshSchedulerParameters();
|
|
self.refreshSchedulerParameters();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
hueUtils.changeURL('/notebook/editor?editor=' + data.id);
|
|
hueUtils.changeURL('/notebook/editor?editor=' + data.id);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -1580,6 +1578,10 @@
|
|
|
self.schedulerViewModel.coordinator.properties.cron_advanced.valueHasMutated(); // Update jsCron enabled status
|
|
self.schedulerViewModel.coordinator.properties.cron_advanced.valueHasMutated(); // Update jsCron enabled status
|
|
|
self.schedulerViewModel.coordinator.tracker().markCurrentStateAsClean();
|
|
self.schedulerViewModel.coordinator.tracker().markCurrentStateAsClean();
|
|
|
self.schedulerViewModel.isEditing(true);
|
|
self.schedulerViewModel.isEditing(true);
|
|
|
|
|
+
|
|
|
|
|
+ if (_action == 'new') {
|
|
|
|
|
+ self.saveScheduler();
|
|
|
|
|
+ }
|
|
|
}).fail(function (xhr) {
|
|
}).fail(function (xhr) {
|
|
|
$(document).trigger("error", xhr.responseText);
|
|
$(document).trigger("error", xhr.responseText);
|
|
|
});
|
|
});
|
|
@@ -1589,18 +1591,20 @@
|
|
|
$.post("/oozie/editor/workflow/action/refresh_parameters/", {
|
|
$.post("/oozie/editor/workflow/action/refresh_parameters/", {
|
|
|
uuid: self.coordinatorUuid()
|
|
uuid: self.coordinatorUuid()
|
|
|
}, function(data) {
|
|
}, function(data) {
|
|
|
- if (data.status == 0 && data.changed) {
|
|
|
|
|
- self.schedulerViewModel.coordinator.refreshParameters()
|
|
|
|
|
- } else {
|
|
|
|
|
|
|
+ if (data.status == 0) {
|
|
|
|
|
+ if (data.changed) {
|
|
|
|
|
+ self.schedulerViewModel.coordinator.refreshParameters()
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
$(document).trigger("error", data.message);
|
|
$(document).trigger("error", data.message);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
self.saveScheduler = function() {
|
|
self.saveScheduler = function() {
|
|
|
if (! self.coordinatorUuid() || self.schedulerViewModel.coordinator.isDirty()) {
|
|
if (! self.coordinatorUuid() || self.schedulerViewModel.coordinator.isDirty()) {
|
|
|
self.schedulerViewModel.save(function(data) {
|
|
self.schedulerViewModel.save(function(data) {
|
|
|
- self.coordinatorUuid(data.uuid);
|
|
|
|
|
|
|
+ self.coordinatorUuid(data.uuid);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
@@ -1614,7 +1618,7 @@
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
self.viewSchedulerId = ko.observable('0000000-160519110441280-oozie-oozi-C');
|
|
self.viewSchedulerId = ko.observable('0000000-160519110441280-oozie-oozi-C');
|
|
|
self.viewScheduler = function() {
|
|
self.viewScheduler = function() {
|
|
|
logGA('schedule/view');
|
|
logGA('schedule/view');
|