Skip to content

Commit

Permalink
Upgrade for 0.70.x
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasjhenry committed Nov 7, 2011
1 parent f61e4fd commit 9894b8e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/controllers/admin/reports_controller_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/reports/stock_requests.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

- @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
%td
= 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|
Expand Down
4 changes: 2 additions & 2 deletions spree_waiting_list.gemspec
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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

0 comments on commit 9894b8e

Please sign in to comment.