airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: showing experiment and project owner in listings
Date Mon, 27 Jun 2016 22:48:21 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 16b4d1ba9 -> f3cb5f532


showing experiment and project owner in listings


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/f3cb5f53
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f3cb5f53
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f3cb5f53

Branch: refs/heads/develop
Commit: f3cb5f53284f8b3aa35cfbb4fd68a8163ee5fff2
Parents: 16b4d1b
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Jun 27 18:48:17 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Jun 27 18:48:17 2016 -0400

----------------------------------------------------------------------
 app/views/partials/experiment-container.blade.php | 10 ++--------
 app/views/project/browse.blade.php                |  4 ++++
 app/views/project/summary.blade.php               |  2 ++
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f3cb5f53/app/views/partials/experiment-container.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-container.blade.php b/app/views/partials/experiment-container.blade.php
index dd1ecd7..4ecf3de 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -11,11 +11,8 @@
         <table class="table">
             <tr>
                 <th>Name</th>
+                <th>Owner</th>
                 <th>Application</th>
-                @if( isset($dashboard))
-                    <th>User</th>
-                @endif
-                <!--<th>Description</th>-->
                 <th>Resource</th>
                 <th>Creation Time</th>
                 <th>Status</th>
@@ -35,16 +32,13 @@
                             <a href="{{URL::to('/')}}/experiment/edit?expId={{$experiment['experiment']->experimentId}}"
title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
                         @endif
                     </td>
+                    <td>{{$experiment['experiment']->userName}}</td>
                     <!-- Application Name -->
                     @if(isset($experiment['expValue']['applicationInterface']))
                     <td>{{ $experiment['expValue']['applicationInterface']->applicationName
}}</td>
                     @else
                     <td></td>
                     @endif
-                    <!-- User Names visible to admin -->
-                @if( isset($dashboard))
-                    <td>{{$experiment['experiment']->userName}}</td>
-                @endif
                     <!-- Resource Name -->
                     <td>
                         @if( !empty( explode("_", $experiment['experiment']->resourceHostId)[0]
) ) 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f3cb5f53/app/views/project/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/browse.blade.php b/app/views/project/browse.blade.php
index 4852ec2..4e68ddc 100755
--- a/app/views/project/browse.blade.php
+++ b/app/views/project/browse.blade.php
@@ -94,6 +94,7 @@
             <tr>
 
                 <th>Name</th>
+                <th>Owner</th>
                 <th>Creation Time</th>
                 <th>Experiments</th>
 
@@ -110,6 +111,9 @@
                             <span class="glyphicon glyphicon-pencil"></span>
                         </a>
                     </td>
+                    <td>
+                        {{$project->owner}}
+                    </td>
                     <td class="time" unix-time="
                             <?php echo $project->creationTime / 1000 ?>">
                     </td>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f3cb5f53/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index dd7a0b3..d65008f 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -31,6 +31,7 @@
                 <tr>
 
                     <th>Name</th>
+                    <th>Owner</th>
                     <th>Application</th>
                     <th>Compute Resource</th>
                     <th>Last Modified Time</th>
@@ -64,6 +65,7 @@
                             <a href="{{URL::to('/')}}/experiment/edit?expId={{$experiment->experimentId}}"
title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>
                         @endif
                     </td>
+                    <td>{{ $experiment->userName }}</td>
                     <td>
                         @if( $applicationInterface != null )
                             {{ $applicationInterface->applicationName }}


Mime
View raw message