diff --git a/app/controllers/admin/reports_controller_decorator.rb b/app/controllers/admin/reports_controller_decorator.rb index 0a44792..9f273d2 100644 --- a/app/controllers/admin/reports_controller_decorator.rb +++ b/app/controllers/admin/reports_controller_decorator.rb @@ -7,7 +7,7 @@ def stock_requests respond_to do |format| format.html do - @stock_requests = @search.paginate(:page => params[:page]) + @stock_requests = @search.page(params[:page]) end format.csv do @stock_requests = @search.all diff --git a/app/views/admin/reports/stock_requests.html.haml b/app/views/admin/reports/stock_requests.html.haml index 85d51b3..a4ea8ae 100644 --- a/app/views/admin/reports/stock_requests.html.haml +++ b/app/views/admin/reports/stock_requests.html.haml @@ -16,7 +16,7 @@ - @stock_requests.each do |stock_request| %tr{:class => cycle('even','odd')} - %td= stock_request.email + %td= stock_request.email %td= link_to stock_request.product.name, edit_admin_product_path(stock_request.product) %td= stock_request.variant.options_text if stock_request.variant %td= stock_request.status.titleize @@ -24,7 +24,7 @@ = time_ago_in_words(stock_request.created_at) = t(:ago) -= will_paginate(@stock_requests, :previous_label => "« #{t('previous')}", :next_label => "#{t('next')} »") += paginate @stock_requests - content_for :sidebar do = form_for @search, :url => stock_requests_admin_reports_path do |f| diff --git a/spree_waiting_list.gemspec b/spree_waiting_list.gemspec index 5b4dbbe..2d405b4 100644 --- a/spree_waiting_list.gemspec +++ b/spree_waiting_list.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_waiting_list' - s.version = '0.2.0' + s.version = '0.3.0' s.summary = 'Add a waiting list to your spree store' s.description = 'The waiting list allows users to signup to be notified via email when an items comes back into stock' s.required_ruby_version = '>= 1.8.7' @@ -16,6 +16,6 @@ Gem::Specification.new do |s| s.has_rdoc = false - s.add_dependency('spree_core', '>= 0.40.0') + s.add_dependency('spree_core', '>= 0.70.0') s.add_dependency('haml', '> 0') end