Skip to content

Commit

Permalink
REMOVE: scope baja en los controladores
Browse files Browse the repository at this point in the history
  • Loading branch information
Olvap committed Feb 27, 2012
1 parent db508ec commit d0e201e
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 27 deletions.
3 changes: 1 addition & 2 deletions app/controllers/agencies_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = Agency.search(params[:search])
else
@search = Agency.baja.search()
@search = Agency.search()
end
@entidads = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand All @@ -26,4 +26,3 @@ def new
end

end

2 changes: 1 addition & 1 deletion app/controllers/cambios_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def index

def new
@cambio = Cambio.new
@search = Reserva.baja.search(:agency_id_eq=>0)
@search = Reserva.search(:agency_id_eq=>0)
@reservas = @search.paginate :page => params[:page], :per_page =>10
end

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/depositos_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ class DepositosController < InheritedResources::Base
load_and_authorize_resource
respond_to :html, :xml, :js, :json
def index
@search = Deposito.baja.search(params[:search])
@search = Deposito.search(params[:search])
@depositos = @search.paginate(:page=>params[:page], :per_page=>10)
@depositos = @depositos.includes :entidad, :reserva => :pasajeros

@reservas_search = Reserva.baja.search()
@reservas_search = Reserva.search()
@reservas = @reservas_search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
format.js
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/entidads_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def index
if params[:search]
@search = Entidad.search(params[:search])
else
@search = Entidad.baja.search()
@search = Entidad.search()
end
@entidads = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/monedas_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def index
if params[:search]
@search = Moneda.search(params[:search])
else
@search = Moneda.baja.search()
@search = Moneda.search()
end
@monedas = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/movimientos_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ class MovimientosController < ApplicationController
load_and_authorize_resource

def index
@search = Deposito.baja.search(params[:search])
@search = Deposito.search(params[:search])
@movimientos = @search.paginate(:page=>params[:page], :per_page=>10)
@movimientos = @movimientos.includes :entidad, :reserva => :pasajeros

@reservas_search = Reserva.baja.search()
@reservas_search = Reserva.search()
@reservas = @reservas_search.paginate :page => params[:page], :per_page =>10

respond_to do |format|
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/operadoras_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = Operadora.search(params[:search])
else
@search = Operadora.baja.search()
@search = Operadora.search()
end
@entidads = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand All @@ -26,4 +26,3 @@ def new
end

end

2 changes: 1 addition & 1 deletion app/controllers/pagos_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def index

def new
@pago = Pago.new
@search = Reserva.baja.search(:agency_id_eq=>0)
@search = Reserva.search(:agency_id_eq=>0)
@reservas = @search.paginate :page => params[:page], :per_page =>10
end

Expand Down
16 changes: 8 additions & 8 deletions app/controllers/pasajeros_controller.rb
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
class PasajerosController < InheritedResources::Base

respond_to :html, :xml,:js
def index
if params[:search]
@search = Pasajero.search(params[:search])
else
@search = Pasajero.baja.search()
@search = Pasajero.search()
end
@pasajeros = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
format.js
format.js
format.xml
format.html
format.pdf do
output = PasajeroReport.new.to_pdf(@search)
send_data output, :filename => "index_report.pdf",
send_data output, :filename => "index_report.pdf",
:type => "application/pdf"
end
end

end

def show
if params[:doc]
@pasajero = Pasajero.where(:doc =>params[:doc]).limit(1)
Expand Down Expand Up @@ -55,6 +55,6 @@ def create
else
render 'pasajeros/new.js'
end
end
end

end
2 changes: 1 addition & 1 deletion app/controllers/programas_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = Programa.search(params[:search])
else
@search = Programa.baja.search()
@search = Programa.search()
end
@programas = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/tdepositos_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = Tdeposito.search(params[:search])
else
@search = Tdeposito.baja.search()
@search = Tdeposito.search()
end
@tdepositos = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/thabitacions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = Thabitacion.search(params[:search])
else
@search = Thabitacion.baja.search()
@search = Thabitacion.search()
end
@thabitacions = @search.paginate :page => params[:page], :per_page =>10
respond_to do |format|
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/vencidas_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def index
if params[:search]
@search = r.search(params[:search])
else
@search = r.baja.search()
@search = r.search()
end

#quita del array las reservas que tienen pagos mayores a pago_minimo
Expand All @@ -25,4 +25,3 @@ def index
end
end
end

3 changes: 1 addition & 2 deletions app/controllers/vouchers_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def index
if params[:search]
@search = r.search(params[:search])
else
@search = r.baja.search()
@search = r.search()
end

@reservas = @search
Expand Down Expand Up @@ -39,4 +39,3 @@ def bajar
end

end

0 comments on commit d0e201e

Please sign in to comment.