diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index eb51fb0..5678704 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,7 +1,11 @@ class AdminController < ApplicationController def dashboard + end + + def get_all_users @users = User.all + render :partial => "layouts/admin/get_all_users" end def get_user diff --git a/app/views/admin/dashboard.html.erb b/app/views/admin/dashboard.html.erb index 3b6a74c..a36b4e4 100644 --- a/app/views/admin/dashboard.html.erb +++ b/app/views/admin/dashboard.html.erb @@ -33,52 +33,9 @@ Manage Users -
- + @@ -107,8 +64,13 @@ function openModal(id){ $("#editAcct").modal('show'); }; +function loadTable(){ + $("#userDataTable").load("/admin/"+ <%=current_user.id %> + "/get_all_users"); +}; + $(document).ready( makeActive, - dataTablePagination() + dataTablePagination(), + loadTable() ); \ No newline at end of file diff --git a/app/views/layouts/admin/_get_all_users.html.erb b/app/views/layouts/admin/_get_all_users.html.erb new file mode 100644 index 0000000..ad43c90 --- /dev/null +++ b/app/views/layouts/admin/_get_all_users.html.erb @@ -0,0 +1,44 @@ +| + Name + | ++ Email + | ++ Admin User + | ++ Action + | +
|---|---|---|---|
| + <%= "#{u.first_name} #{u.last_name}"%> + | ++ <%= u.email%> + | ++ <%= u.admin ? %{ | ++ <%= link_to "Edit", "#", {:onClick => "javascript:openModal(#{u.id});" ,:role => "button", :class => "btn btn-inverse", "data-toggle" => "modal"}%> + <%= link_to "Delete", "#", {:class => "btn btn-danger"}%> + | +