From b17512361883d5efe82be857c542fcd7c01eca02 Mon Sep 17 00:00:00 2001 From: Matthew Letter Date: Mon, 10 Oct 2016 15:29:22 -0600 Subject: [PATCH] updated hostname for batch files #633 --- packages/slycat/web/server/handlers.py | 4 ++-- web-server/js/slycat-remote-interface.js | 2 +- web-server/js/slycat-web-client.js | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/slycat/web/server/handlers.py b/packages/slycat/web/server/handlers.py index 5b4289078..6ce6fb3a0 100644 --- a/packages/slycat/web/server/handlers.py +++ b/packages/slycat/web/server/handlers.py @@ -2023,8 +2023,8 @@ def post_remote_launch(): @cherrypy.tools.json_in(on=True) @cherrypy.tools.json_out(on=True) -def post_submit_batch(): - sid = cherrypy.request.json["sid"] +def post_submit_batch(hostname): + sid = get_sid(hostname) filename = cherrypy.request.json["filename"] with slycat.web.server.remote.get_session(sid) as session: return session.submit_batch(filename) diff --git a/web-server/js/slycat-remote-interface.js b/web-server/js/slycat-remote-interface.js index 9cdc79e1c..86ee21aae 100644 --- a/web-server/js/slycat-remote-interface.js +++ b/web-server/js/slycat-remote-interface.js @@ -206,7 +206,7 @@ define('slycat-remote-interface', ['knockout', 'knockout-mapping', 'slycat-serve var uid = generateUniqueId(); client.post_submit_batch({ - sid: vm.remote.sid(), + hostname: vm.remote.hostname(), filename: vm.batch(), success: function(results) { if (results.errors) { diff --git a/web-server/js/slycat-web-client.js b/web-server/js/slycat-web-client.js index 05fa27732..b7937e3da 100644 --- a/web-server/js/slycat-web-client.js +++ b/web-server/js/slycat-web-client.js @@ -864,11 +864,10 @@ define("slycat-web-client", ["slycat-server-root", "jquery", "URI"], function(se $.ajax({ contentType: 'application/json', data: JSON.stringify({ - sid: params.sid, filename: params.filename }), type: 'POST', - url: server_root + 'remotes/submit-batch', + url: server_root + 'remotes/'+params.hostname+'submit-batch', success: function(result) { if (params.success) params.success(result);