airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [16/21] airavata-php-gateway git commit: Removing storage link visible to not logged in users
Date Fri, 11 Mar 2016 07:00:32 GMT
Removing storage link visible to not logged in users


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

Branch: refs/heads/master
Commit: ce33ae9b9ce4f51e6cfab555eb19bf1666de4c0f
Parents: 7a66865
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Tue Mar 8 13:54:31 2016 -0500
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Tue Mar 8 13:54:31 2016 -0500

----------------------------------------------------------------------
 app/libraries/CommonUtilities.php     | 5 +++--
 app/libraries/ExperimentUtilities.php | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ce33ae9b/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index dc3e7a3..2dcddd8 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -194,10 +194,11 @@ class CommonUtilities
         }
 
         $active = "";
-        if( Session::has("nav-active"))
+        if( Session::has("nav-active") && Session::has('loggedin') ){
             if( Session::get("nav-active") == "storage")
                 $active = "active";
-        echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/files/browse"><span
class="glyphicon glyphicon-folder-close"></span> Storage</a></li>';
+            echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/files/browse"><span
class="glyphicon glyphicon-folder-close"></span> Storage</a></li>';
+        }
         echo '</ul>
 
         <ul class="nav navbar-nav navbar-right">';

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ce33ae9b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 3423d95..3a0952e 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -81,7 +81,8 @@ class ExperimentUtilities
                                     $inputArray[ count($inputArray)-3] . '/' . 
                                     $inputArray[ count($inputArray)-2] . '/' . 
                                     $inputArray[ count($inputArray)-1] . '">' .
-                '<span class="glyphicon glyphicon-new-window"></span></a></p>';
+                                        $inputArray[ count($inputArray)-1] . 
+                ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
             }elseif($input->type == DataType::URI && !empty($input->metaData)
                 && json_decode($input->metaData)->location=="remote"){
                 echo '<p>' . $input->name . ': ' . $input->value . '</p>';
@@ -664,6 +665,7 @@ class ExperimentUtilities
                                                 $outputPathArray[ count($outputPathArray)-3]
. "/" . 
                                                 $outputPathArray[ count($outputPathArray)-2]
. '/' . 
                                                 $outputPathArray[ count($outputPathArray)-1]
. '">' .
+                                                    $outputPathArray[sizeof($outputPathArray)
- 1] . 
                         ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
                 }
 //                else


Mime
View raw message