From 4337cb9a468088422ef1166abbce5a8fdf5f4dbf Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Mon, 20 May 2013 17:35:24 -0400 Subject: [PATCH] made sure the table refreshes after an update --- app/controllers/admin_controller.rb | 4 ++ app/views/admin/dashboard.html.erb | 56 +++---------------- .../layouts/admin/_get_all_users.html.erb | 44 +++++++++++++++ app/views/layouts/admin/_get_user.html.erb | 1 + config/routes.rb | 1 + 5 files changed, 59 insertions(+), 47 deletions(-) create mode 100644 app/views/layouts/admin/_get_all_users.html.erb 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 -
-
- - - - - - - - - - - <% @users.each do |u|%> - - - - - - - <% end %> - -
- 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"}%> -
- -
-
-
-
- +
+ +
@@ -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 @@ +
+ + + + + + + + + + + <% @users.each do |u|%> + + + + + + + <% end %> + +
+ 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"}%> +
+ +
+
+
+ \ No newline at end of file diff --git a/app/views/layouts/admin/_get_user.html.erb b/app/views/layouts/admin/_get_user.html.erb index e2b3b2d..b914b5f 100644 --- a/app/views/layouts/admin/_get_user.html.erb +++ b/app/views/layouts/admin/_get_user.html.erb @@ -54,6 +54,7 @@ type: "POST", success: function(response) { $('#success').show(500).delay(1500).fadeOut(); + loadTable(); }, error: function(event) { $('#failure').show(500).delay(1500).fadeOut(); diff --git a/config/routes.rb b/config/routes.rb index 5288ebd..357e7fa 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,6 +32,7 @@ resources :admin do get "dashboard" get "get_user" put "update_user" + get "get_all_users" end resources :dashboard do