Repository: airavata-php-gateway Updated Branches: refs/heads/master dd1298322 -> f2a1a741c
changing hardcoded ssh value to ssh_fork Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/f2a1a741 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f2a1a741 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f2a1a741 Branch: refs/heads/master Commit: f2a1a741ccec966c8e82ba0dee56729d5f55f412 Parents: dd12983 Author: Supun Nakandala <[email protected]> Authored: Fri Aug 28 01:01:18 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Fri Aug 28 01:01:18 2015 +0530 ---------------------------------------------------------------------- app/libraries/CRUtilities.php | 4 ++-- public/js/script.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f2a1a741/app/libraries/CRUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php index a2a002c..1494cde 100755 --- a/app/libraries/CRUtilities.php +++ b/app/libraries/CRUtilities.php @@ -163,7 +163,7 @@ class CRUtilities return $localSub; } - } else if ($inputs["jobSubmissionProtocol"] == JobSubmissionProtocol::SSH) /* SSH */ { + } else if ($inputs["jobSubmissionProtocol"] == JobSubmissionProtocol::SSH_FORK) /* SSH */ { $resourceManager = new ResourceJobManager(array( "resourceJobManagerType" => $inputs["resourceJobManagerType"], "pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"], @@ -176,7 +176,7 @@ class CRUtilities "resourceJobManager" => $resourceManager, "alternativeSSHHostName" => $inputs["alternativeSSHHostName"], "sshPort" => intval($inputs["sshPort"]), - "monitorMode" => intval($inputs["monitorMode"]) + "monitorMode" => MonitorMode::FORK ) ); //var_dump( $sshJobSubmission); exit; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f2a1a741/public/js/script.js ---------------------------------------------------------------------- diff --git a/public/js/script.js b/public/js/script.js index be0826e..3e55ded 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -67,7 +67,7 @@ $(document).ready( function(){ { $(this).after( parentResDiv + $(".resource-manager-block").html() + "</div>" ); } - else if( selectedVal == "ssh") + else if( selectedVal == "ssh_fork") { $(this).after( parentResDiv + $(".ssh-block").html() @@ -110,7 +110,7 @@ $(document).ready( function(){ } //temporary till all protocols are not setup - if( selectedVal == "local" || selectedVal == "ssh" || selectedVal == "unicore" ) + if( selectedVal == "local" || selectedVal == "ssh_fork" || selectedVal == "unicore" ) $(".jspSubmit").removeClass("hide"); else $(".jspSubmit").addClass("hide");
