Repository: airavata-php-gateway Updated Branches: refs/heads/master 5b2951877 -> d5feccee7
UI for adding roles to user - added. 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/d5feccee Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d5feccee Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d5feccee Branch: refs/heads/master Commit: d5feccee7751c4c1e076acfceb65c1decdafa595 Parents: 5b29518 Author: Nipurn Doshi <[email protected]> Authored: Thu May 14 15:29:10 2015 -0400 Committer: Nipurn Doshi <[email protected]> Committed: Thu May 14 15:29:10 2015 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 7 ++++++ app/routes.php | 2 ++ app/views/admin/manage-users.blade.php | 39 ++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d5feccee/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index 0c8e514..ae611b4 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -96,6 +96,13 @@ class AdminController extends BaseController { return View::make("admin/manage-credentials", array("tokens" => array()) ); } + public function updateUserRoles(){ + if( Input::has("add")) + return WSIS::updateUserRoles(Input::get("username"), array("new"=> Input::get("roles"), "deleted" => array() ) ); + else + return WSIS::updateUserRoles(Input::get("username"), array("new"=> array(), "deleted" => Input::get("roles") ) ); + } + /* ---- Super Admin Functions ------- */ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d5feccee/app/routes.php ---------------------------------------------------------------------- diff --git a/app/routes.php b/app/routes.php index 2f98343..a0e141c 100755 --- a/app/routes.php +++ b/app/routes.php @@ -184,6 +184,8 @@ Route::post("admin/check-roles", "AdminController@getRoles"); Route::post("admin/delete-role", "AdminController@deleteRole"); +Route::post("admin/add-roles-to-user", "AdminController@addRolesToUser"); + //Super Admin Specific calls Route::post("admin/add-gateway", "AdminController@addGateway"); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d5feccee/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 ab635b8..96afb18 100644 --- a/app/views/admin/manage-users.blade.php +++ b/app/views/admin/manage-users.blade.php @@ -80,7 +80,7 @@ <div class="roles-list"> </div> <div class="add-roles-block hide"> - <div class="form-group form-horizontal"> + <div class="form-group well"> <label class="control-label">Add a new role to the user</label> <select multiple name="new-role" class="new-roles-select" class="form-control"> <option>Select a role</option> @@ -88,13 +88,13 @@ <option value="{{$role}}">{{$role}}</option> @endforeach </select> - <button type="button" class="btn btn primary add-roles-submit">Add Roles</button> + <button type="button" class="btn btn-primary add-roles-submit" data-username="">Add Roles</button> </div> </div> </div> <div class="modal-footer"> <div class="form-group"> - <input type="submit" class="btn btn-primary" data-dismiss="modal" value="Close"/> + <input type="submit" class="btn" data-dismiss="modal" value="Close"/> </div> </div> </div> @@ -128,12 +128,16 @@ $(".new-roles-select option").each(function() { $(this).removeAttr("disabled"); - } + }); + var userName = $(this).data("username"); $("#check-role-block").modal("show"); $(".roles-of-user").html( "User : " + userName); $(".roles-load").removeClass("hide"); $(".roles-list").addClass("hide"); + $(".add-roles-submit").data("username", userName); + $(this).find(".alert-success").remove(); + //getting user's existing roles $.ajax({ @@ -166,11 +170,34 @@ } $(".roles-load").addClass("hide"); $(".roles-list").removeClass("hide"); + + }); $(".add-roles-submit").click( function(){ - console.log( $(".new-roles-select").val() ); - }) + $(this).attr("disabled", "disabled"); + $(this).html("<img src='" + $(".base-url").val() + "/ajax-loader.gif'/>"); + userName = $(this).data("username"); + var rolesToAdd = $(".new-roles-select").val(); + $(".roles-list").find(".role-name").each( function(){ + rolesToAdd.push( $(this).html() ); + }) + $.ajax({ + type: "POST", + url: $(".base-url").val() + "/admin/add-roles-to-user", + data: + { + add: true, + username: userName, + roles : rolesToAdd + }, + success( data){ + console.log( data); + } + }); + $(".add-roles-submit").html( "Add Roles"); + $(".add-roles-submit").append("<span class='alert alert-success col-md-12'>Roles have been added</span>"); + }); }); </script>
