DGNum/demarches-normaliennes
11
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-04-19 10:41:33 +02:00
commit a243ad9b87
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/administrations_controller.rb
View file

@ -5,13 +5,14 @@ class AdministrationsController < ApplicationController
before_action :authenticate_administration! before_action :authenticate_administration!
def index def index
@admin = Administrateur.new
@admins = smart_listing_create :admins, @admins = smart_listing_create :admins,
Administrateur.all, Administrateur.all.order(:email),
partial: "administrations/list", partial: "administrations/list",
array: true array: true
@admin = Administrateur.new
end end
def show def show

1
app/views/administrations/_list.html.haml
View file

@ -20,6 +20,7 @@
= smart_listing.paginate = smart_listing.paginate
= smart_listing.pagination_per_page_links = smart_listing.pagination_per_page_links
- else - else
%h4.center %h4.center
Aucun administrateur créé Aucun administrateur créé

1
app/views/administrations/index.js.erb Normal file
View file

@ -0,0 +1 @@
<%= smart_listing_update :admins %>