#263 update nns param

vipshop · Oct 19, 2017 · d6045a0 · d6045a0
1 parent 7eff187
commit d6045a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/saturn-console/src/main/resources/static/js/job_detail.js b/saturn-console/src/main/resources/static/js/job_detail.js
@@ -820,7 +820,7 @@ $(function() {
                 "url": "job/loadHistoryConfig",
                 "type": "POST",
                 "deferRender": true,
-                "data": {jobName:jobName},
+                "data": {jobName:jobName,ns:$("#namespace").val(), nns:regName},
                 "dataSrc": "data"
             },
             "rowCallback": function( row, data, displayIndex, displayIndexFull ) {
@@ -922,7 +922,7 @@ $(function() {
 	function bindCheckAndForecastCronButton() {
 		 $(document).on("click", "#check-and-forecast-cron", function(event) {
 			var timeZone = $("#timeZone").val();
-			$.post("job/checkAndForecastCron", {timeZone: timeZone, cron : $("#cron").val()}, function (data) {
+			$.post("job/checkAndForecastCron", {timeZone: timeZone, cron : $("#cron").val(),nns:regName}, function (data) {
 				var msg = "检验结果：";
 				if(data.success == true) {
                     msg += "成功";

diff --git a/saturn-console/src/main/resources/static/js/overview.js b/saturn-console/src/main/resources/static/js/overview.js
@@ -770,7 +770,7 @@ $(function() {
         var $btn = $(this).button('loading');
         var jobName = $("#migrate-jobName").html();
         var newTask = $("#migrate-job-tasks-select").find("option:selected").val();
-        $.post("job/migrateJobNewTask", {jobName : jobName, newTask : newTask}, function(data) {
+        $.post("job/migrateJobNewTask", {jobName : jobName, newTask : newTask,nns:regName}, function(data) {
             if(data.success == true) {
                 showSuccessDialogWithCallback(function() {location.reload(true);});
             } else {
@@ -785,7 +785,7 @@ $(function() {
         var $btn = $(this).button('loading');
         var jobName = $("#batch-migrate-jobName").html();
         var newTask = $("#batch-migrate-job-tasks-select").find("option:selected").val();
-        $.post("job/batchMigrateJobNewTask", {jobNames : jobName, newTask : newTask}, function(data) {
+        $.post("job/batchMigrateJobNewTask", {jobNames : jobName, newTask : newTask,nns:regName}, function(data) {
             if(data.success == true) {
                 showSuccessDialogWithCallback(function() {location.reload(true);});
             } else {
@@ -802,7 +802,7 @@ $(function() {
         if($("#batch-preferList").val() != null) {
             var newPreferExecutors = $("#batch-preferList").val().toString();
         }
-        $.post("job/batchSetPreferExecutors", {jobNames : jobName, newPreferExecutors : newPreferExecutors}, function(data) {
+        $.post("job/batchSetPreferExecutors", {jobNames : jobName, newPreferExecutors : newPreferExecutors,nns:regName}, function(data) {
             if(data.success == true) {
                 showSuccessDialogWithCallback(function() {location.reload(true);});
             } else {
@@ -1333,7 +1333,7 @@ $(function() {
     	selectedJobName = $jobNamesSelect.val();
     	var st = $("#start-time").val();
     	var et = $("#end-time").val();
-    	$logstashTable.ajax.url("logstash?jn="+selectedJobName+"&st="+st+"&et="+et).load();
+    	$logstashTable.ajax.url("logstash?jn="+selectedJobName+"&st="+st+"&et="+et+"&nns="+regName+"&ns="+ns).load();
     }); 
     if ($("#jobs").is(':visible')) {
     	$loading.show();
@@ -1542,7 +1542,7 @@ $(function() {
 			});
             $("#jobs-overview-tbl_filter label").before(jobOperation);
 
-            $.get("job/getAllJobGroups", {}, function (data) {
+            $.get("job/getAllJobGroups", {nns:regName}, function (data) {
         		if(!data){
         			return;
         		}
@@ -2287,7 +2287,7 @@ $(function() {
     }
 
     function checkAndForecastCron(timeZone, cron) {
-        $.post("job/checkAndForecastCron", {timeZone: timeZone, cron : cron}, function (data) {
+        $.post("job/checkAndForecastCron", {timeZone: timeZone, cron : cron,nns:regName}, function (data) {
             var msg = "检验结果：";
             if(data.success == true) {
                 msg += "成功";