airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [28/50] airavata-php-gateway git commit: AIRAVATA-2405 Warn that only most recent users are searched by role
Date Thu, 03 Aug 2017 17:03:19 GMT
AIRAVATA-2405 Warn that only most recent users are searched by role


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

Branch: refs/heads/master
Commit: 2af52834fd4ba11327625a273b180cbe52ef40a8
Parents: bbc3060
Author: Marcus Christie <machrist@iu.edu>
Authored: Sat Jul 8 22:28:58 2017 -0500
Committer: Marcus Christie <machrist@iu.edu>
Committed: Sat Jul 8 22:28:58 2017 -0500

----------------------------------------------------------------------
 app/controllers/AdminController.php    | 1 +
 app/views/admin/manage-users.blade.php | 9 +++++++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af52834/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 4bf52bb..91fa3b9 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -73,6 +73,7 @@ class AdminController extends BaseController {
 	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 who have role " . htmlspecialchars(Input::get("role")) . "
are listed.");
 			$users = IamAdminServicesUtilities::getUsersWithRole(Input::get("role"));
 		}
 		else

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af52834/app/views/admin/manage-users.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php
index 9f36ca8..c8ea524 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -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">


Mime
View raw message