Merge branch 'develop' into staging

2016-04-19 10:41:33 +02:00 · 2016-04-19 10:41:33 +02:00 · a243ad9b87
commit a243ad9b87
parent 85cfadadea a8070cac6d
3 changed files with 5 additions and 2 deletions
--- a/app/controllers/administrations_controller.rb
+++ b/app/controllers/administrations_controller.rb
@ -5,13 +5,14 @@ class AdministrationsController < ApplicationController
  before_action :authenticate_administration!

  def index
+    @admin = Administrateur.new

    @admins = smart_listing_create :admins,
-                                   Administrateur.all,
+                                   Administrateur.all.order(:email),
                                   partial: "administrations/list",
                                   array: true

-    @admin = Administrateur.new
+
  end

  def show
--- a/app/views/administrations/_list.html.haml
+++ b/app/views/administrations/_list.html.haml
@ -20,6 +20,7 @@

  = smart_listing.paginate
  = smart_listing.pagination_per_page_links
+
 - else
  %h4.center
    Aucun administrateur créé
--- a/app/views/administrations/index.js.erb
+++ b/app/views/administrations/index.js.erb
@ -0,0 +1 @@
+<%= smart_listing_update :admins %>