diff --git a/app/controllers/paginable/users_controller.rb b/app/controllers/paginable/users_controller.rb index 56714c8..4f46b00 100644 --- a/app/controllers/paginable/users_controller.rb +++ b/app/controllers/paginable/users_controller.rb @@ -3,6 +3,6 @@ # /paginable/users/index/:page def index authorize User - paginable_renderise(partial: 'index', scope: current_user.org.users.includes(:roles), locals: { page: params[:page] }) + paginable_renderise(partial: 'index', scope: current_user.org.users.includes(:roles)) end end \ No newline at end of file diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e61380f..5fa2798 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -28,7 +28,7 @@ "user" => { "id" => @user.id, "html" => render_to_string(partial: 'users/admin_grant_permissions', - locals: { user: @user, perms: @perms, page: params[:page] }, + locals: { user: @user, perms: @perms }, formats: [:html]) } }.to_json diff --git a/app/views/paginable/users/_index.html.erb b/app/views/paginable/users/_index.html.erb index 4a40d18..65da84d 100644 --- a/app/views/paginable/users/_index.html.erb +++ b/app/views/paginable/users/_index.html.erb @@ -1,7 +1,7 @@
- +
diff --git a/app/views/users/_admin_grant_permissions.html.erb b/app/views/users/_admin_grant_permissions.html.erb index cccad9e..82273a8 100644 --- a/app/views/users/_admin_grant_permissions.html.erb +++ b/app/views/users/_admin_grant_permissions.html.erb @@ -13,7 +13,6 @@ <%= form_tag( admin_update_permissions_user_path(@user), method: :put, remote: true, class: 'admin_update_permissions' ) do %>
<%= _('Name') %> <%= paginable_sort_link('firstname') %>