nicolas/crossey_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug tri agenda corrigé.

Browse Source
This commit is contained in:
Nicolas Bally 2013-12-13 16:56:16 +01:00
parent c54b1650d3
commit c03d47d355
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/admin/events_controller.rb
View File

@ -98,10 +98,17 @@ class Admin::EventsController < ApplicationController
@events = Event.order('start_at, stop_at') @events = Event.order('start_at, stop_at')
@events = @events.after(start) if start @events = @events.after(start) if start
@events = @events.before(stop) if stop @events = @events.before(stop) if stop
per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 1500 per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 20
page = (params[:page] and params[:page] != "") ? params[:page] : 1 page = (params[:page] and params[:page] != "") ? params[:page] : 1
@events = Event.all.page(page).per(per_page) #@events = Event.all.page(page).per(per_page)
#@events = Event.order('start_at, stop_at').after(start).before(stop) @events = Event.order('start_at DESC, stop_at DESC')
@events = @events.after(start) if start
@events = @events.before(stop) if stop
@events = @events.page(page).per(per_page)
end end
end end

38
app/views/admin/events/_index_block.html.haml
View File

@ -1,22 +1,28 @@
.search_pannel .search_pannel
=form_tag "", :method => "get", :remote => true do =form_tag "", :method => "get", :remote => true do
.field_with_suppr .input-append
=text_field_tag :start, params[:start],:class => "datepicker" =text_field_tag :start, params[:start],:class => "datepicker", :placeholder => "Début"
.suppr %button.btn{:onclick => "$(this).prev('input').val('');"}
=i(:remove, :icon => false) =i(:remove, :icon => false)
.field_with_suppr
=text_field_tag :stop, params[:stop], :class => "datepicker" .input-append
.suppr =text_field_tag :stop, params[:stop],:class => "datepicker", :placeholder => "Fin"
=i(:remove, :icon => false) %button.btn
=i(:remove, :icon => false)
=submit_tag "filtrer", :class => "btn"
=submit_tag "filtrer", :class => "btn", :style => "margin-bottom: 10px;"
%table#events.table.table-hover %table#events.table.table-hover
=render @events =render @events
#pagination #pagination
= paginate @events, :remote => true = paginate @events, :remote => true