Skip to content
Permalink
Browse files
Merge remote-tracking branch 'upstream/develop' into develop
  • Loading branch information
Sneha Tilak authored and Sneha Tilak committed Jul 9, 2017
2 parents 315a890 + 5f30245 commit cf2274a7a4dfe629ba1d75d4fc91a040ca521002
Showing 4 changed files with 15 additions and 3 deletions.
@@ -73,6 +73,9 @@ public function addAdminSubmit(){
public function usersView(){
if( Input::has("role"))
{
Session::flash("warning-message", "Please note: the following list "
. "may not be complete. Only the most recent 100 users have been "
. "searched for role " . htmlspecialchars(Input::get("role")) . ".");
$users = IamAdminServicesUtilities::getUsersWithRole(Input::get("role"));
}
else
@@ -238,7 +238,7 @@ public static function create_nav_bar()
}
}

if( Session::has('authorized-user') || Session::has('admin') || Session::has('admin-read-only')){
if( Session::has('authorized-user') || Session::has('admin') || Session::has('admin-read-only') || Session::has('gateway-provider') ){
$navbar .= '<li><a href="' . URL::to('/') . '/account/settings"><span class="glyphicon glyphicon-cog"></span> User settings</a></li>';
}
$navbar .= '<li><a href="' . URL::to('/') . '/logout"><span class="glyphicon glyphicon-log-out"></span> Log out</a></li>';
@@ -22,6 +22,15 @@
</div>
{{ Session::forget("message") }}
@endif
@if( Session::has("warning-message"))
<div class="row">
<div class="alert alert-warning alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert"><span
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
{{ Session::get("warning-message") }}
</div>
</div>
@endif
</div>
<div class="container-fluid">
<div class="col-md-12">
@@ -28,8 +28,8 @@
</p>
<p><a href="https://github.com/apache/airavata-php-gateway"
target="_blank">See the code <span class="glyphicon glyphicon-new-window"></span></a></p>
<p><a href="https://cwiki.apache.org/confluence/display/AIRAVATA/XSEDE+2016+Tutorials"
target="_blank">XSEDE 2016 tutorial documentation <span class="glyphicon glyphicon-new-window"></span></a>
<p><a href="https://cwiki.apache.org/confluence/display/AIRAVATA/PEARC+2017+Tutorials"
target="_blank">PEARC 2017 tutorial documentation <span class="glyphicon glyphicon-new-window"></span></a>
</p>
</div>
</div>

0 comments on commit cf2274a

Please sign in to comment.