airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [1/2] airavata-php-gateway git commit: Changing dashboard name to Admin Dashboard
Date Tue, 14 Jul 2015 18:36:57 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master d85fecd0b -> 77c835d7e


Changing dashboard name to Admin Dashboard


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

Branch: refs/heads/master
Commit: 26842bf7c1dd02aa3b9153c1b811bef5d0c3764a
Parents: d85fecd
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Tue Jul 14 23:18:16 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Tue Jul 14 23:18:16 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/26842bf7/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index a8eb40e..edc9ae1 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -191,7 +191,7 @@ class CommonUtilities
                     $active = " active ";
             }
             if (Session::has("admin"))
-                echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span
class="glyphicon glyphicon-user"></span> Dashboard</a></li>';
+                echo '<li><a href="' . URL::to("/") . '/admin/dashboard"><span
class="glyphicon glyphicon-user"></span>Admin Dashboard</a></li>';
             else
                 echo '<li><a href="' . URL::to("/") . '/user/profile"><span
class="glyphicon glyphicon-user"></span> Profile</a></li>';
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/26842bf7/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index b0ec5ca..ea3def9 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -583,7 +583,7 @@ class ExperimentUtilities
                     //echo '<p>' . $output->key .  ': <a href="' . $output->value
. '">' . $output->value . '</a></p>';
                     $outputPath = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
                         Config::get('pga_config.airavata')['experiment-data-dir'], $output->value);
-                    $outputPath = str_replace('//', '/', $outputPath);
+
                     if(file_exists(str_replace('//','/',$output->value))){
                         $outputPathArray = explode("/", $outputPath);
 


Mime
View raw message