Repository: airavata-php-gateway Updated Branches: refs/heads/master dff64c0b9 -> c7adf119e
fixing edit CR issue 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/c7adf119 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c7adf119 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c7adf119 Branch: refs/heads/master Commit: c7adf119eca10fedabafee6cefd20db5cfbb4d9b Parents: dff64c0 Author: Supun Nakandala <[email protected]> Authored: Mon Aug 31 22:03:33 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Mon Aug 31 22:03:33 2015 +0530 ---------------------------------------------------------------------- app/libraries/CRUtilities.php | 4 ++-- public/js/script.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c7adf119/app/libraries/CRUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php index 1494cde..6415d5f 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_FORK) /* SSH */ { + } else if ($inputs["jobSubmissionProtocol"] == JobSubmissionProtocol::SSH_FORK) { $resourceManager = new ResourceJobManager(array( "resourceJobManagerType" => $inputs["resourceJobManagerType"], "pushMonitoringEndpoint" => $inputs["pushMonitoringEndpoint"], @@ -312,7 +312,7 @@ class CRUtilities //jsp = job submission protocol type if ($jsp == JobSubmissionProtocol::LOCAL) return Airavata::getLocalJobSubmission(Session::get('authz-token'), $jobSubmissionInterfaceId); - else if ($jsp == JobSubmissionProtocol::SSH) + else if ($jsp == JobSubmissionProtocol::SSH || $jsp == JobSubmissionProtocol::SSH_FORK) return Airavata::getSSHJobSubmission(Session::get('authz-token'), $jobSubmissionInterfaceId); else if ($jsp == JobSubmissionProtocol::UNICORE) return Airavata::getUnicoreJobSubmission(Session::get('authz-token'), $jobSubmissionInterfaceId); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c7adf119/public/js/script.js ---------------------------------------------------------------------- diff --git a/public/js/script.js b/public/js/script.js index 3e55ded..7ad2e94 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_fork") + else if( selectedVal == "ssh_fork" || selectedVal == "ssh") { $(this).after( parentResDiv + $(".ssh-block").html()
