You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/03/28 19:52:32 UTC

[airavata-php-gateway] branch master updated: AIRAVATA-2500 Don't display Additional Info if account is all set up

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git


The following commit(s) were added to refs/heads/master by this push:
     new 81d59ea  AIRAVATA-2500 Don't display Additional Info if account is all set up
81d59ea is described below

commit 81d59ea8a390e65d3c2e9e5f439de5796ba2231d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Mar 28 15:52:25 2018 -0400

    AIRAVATA-2500 Don't display Additional Info if account is all set up
---
 app/views/partials/auto-provisioned-accounts.blade.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/partials/auto-provisioned-accounts.blade.php b/app/views/partials/auto-provisioned-accounts.blade.php
index 58a3a29..cd92941 100644
--- a/app/views/partials/auto-provisioned-accounts.blade.php
+++ b/app/views/partials/auto-provisioned-accounts.blade.php
@@ -41,8 +41,13 @@
                                 @endif
                             </td>
                             <td>{{{ $auto_provisioned_account["hostname"] }}}</td>
-                            {{-- Not escaping HTML to allow Gateway Admin to put HTML into additionalInfo field --}}
-                            <td>{{ $auto_provisioned_account["additionalInfo"] }}</td>
+                            <td>
+                            {{-- Only display additional info if account isn't completely setup --}}
+                            @if ($auto_provisioned_account["userComputeResourcePreference"] == null || !$auto_provisioned_account["userComputeResourcePreference"]->validated)
+                                {{-- Not escaping HTML to allow Gateway Admin to put HTML into additionalInfo field --}}
+                                {{ $auto_provisioned_account["additionalInfo"] }}
+                            @endif
+                            </td>
                             <td>{{{ $auto_provisioned_account["errorMessage"] }}}</td>
                         </tr>
                     @endforeach

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.