diff --git a/.gitignore b/.gitignore index 9ab27139f..9e4b54be1 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ composer.lock .env.php .DS_Store Thumbs.db +pga_config.php /app/storage -/themes \ No newline at end of file +/themes diff --git a/app/libraries/Keycloak/API/RoleMapper.php b/app/libraries/Keycloak/API/RoleMapper.php index f2fab42ac..9fd7d5dbc 100644 --- a/app/libraries/Keycloak/API/RoleMapper.php +++ b/app/libraries/Keycloak/API/RoleMapper.php @@ -30,6 +30,7 @@ public function getRealmRoleMappingsForUser($realm, $user_id){ curl_setopt($r, CURLOPT_RETURNTRANSFER, 1); curl_setopt($r, CURLOPT_ENCODING, 1); curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer); + curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path); curl_setopt($r, CURLOPT_HTTPHEADER, array( "Authorization: Bearer " . $access_token )); diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php index b910aeab6..9349db9e1 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -4,6 +4,7 @@ margin-bottom: 20px; } +
@if(isset( $invalidExperimentId ) )
@@ -40,21 +41,95 @@ class="sr-only">Close @endif +
+ + + + + + + + + + + + + + + + + + +
- + - + - + - + @if (isset($project)) @@ -62,17 +137,17 @@ class="sr-only">Close @endif - + - + - + @endif - + @@ -154,39 +229,39 @@ class="sr-only">Close @endif - + - + - + - + - + - + - + - + - + userConfigurationData->experimentDataDir, Config::get("pga_config.airavata")['experiment-data-absolute-path'])){ @@ -199,7 +274,7 @@ class="sr-only">Close {{-- @if( $expVal["editable"] == false)--}} - +
Experiment ID {{{ $experiment->experimentId }}}
Name {{{ $experiment->experimentName }}}
Description {{{ $experiment->description }}}
Project{{{ $project->name }}} You don't have access to this project.
Owner {{{ $experiment->userName }}}
Application applicationName; } ?>
Compute Resource hostName; @@ -86,7 +161,7 @@ class="sr-only">Close
Experiment Status {{{ $expVal["experimentStatusString"] }}}
Creation Time
Last Modified Time
Wall Time {{ $experiment->userConfigurationData->computationalResourceScheduling->wallTimeLimit }}
CPU Count {{ $experiment->userConfigurationData->computationalResourceScheduling->totalCPUCount }}
Node Count {{ $experiment->userConfigurationData->computationalResourceScheduling->nodeCount }}
Queue {{ $experiment->userConfigurationData->computationalResourceScheduling->queueName }}
Inputs {{ ExperimentUtilities::list_input_files($experiment->experimentInputs) }}
Outputs {{ ExperimentUtilities::list_output_files($experiment->experimentOutputs, $experiment->experimentStatus[0]->state, false) }}
Storage Directory
Errors @if( $experiment->errors != null) @@ -430,6 +505,38 @@ class="btn btn-info"