Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'production'

  • Loading branch information...
commit ba15f5a3c1e68630960cbe76dacedd5124f1370c 2 parents 996d3db + ceff60d
@aross aross authored
View
2  Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.17'
+gem 'rails', '3.0.19'
gem 'rake', '0.8.7'
# database gems -- need both pg and mysql for app and wiki
View
54 Gemfile.lock
@@ -24,12 +24,12 @@ GEM
RedCloth (4.2.9)
ZenTest (4.5.0)
abstract (1.0.0)
- actionmailer (3.0.17)
- actionpack (= 3.0.17)
+ actionmailer (3.0.19)
+ actionpack (= 3.0.19)
mail (~> 2.2.19)
- actionpack (3.0.17)
- activemodel (= 3.0.17)
- activesupport (= 3.0.17)
+ actionpack (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
@@ -37,19 +37,19 @@ GEM
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.17)
- activesupport (= 3.0.17)
+ activemodel (3.0.19)
+ activesupport (= 3.0.19)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.17)
- activemodel (= 3.0.17)
- activesupport (= 3.0.17)
+ activerecord (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.17)
- activemodel (= 3.0.17)
- activesupport (= 3.0.17)
- activesupport (3.0.17)
+ activeresource (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
+ activesupport (3.0.19)
addressable (2.2.6)
airbrake (3.0.9)
activesupport
@@ -160,7 +160,7 @@ GEM
i18n (0.5.0)
jammit (0.6.3)
yui-compressor (>= 0.9.3)
- json (1.5.1)
+ json (1.5.4)
json_pure (1.7.3)
mail (2.2.19)
activesupport (>= 2.3.6)
@@ -205,7 +205,7 @@ GEM
pg (0.11.0)
polyglot (0.3.3)
rabl (0.2.8)
- rack (1.2.5)
+ rack (1.2.6)
rack-contrib (1.1.0)
rack (>= 0.9.1)
rack-mount (0.6.14)
@@ -215,17 +215,17 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.17)
- actionmailer (= 3.0.17)
- actionpack (= 3.0.17)
- activerecord (= 3.0.17)
- activeresource (= 3.0.17)
- activesupport (= 3.0.17)
+ rails (3.0.19)
+ actionmailer (= 3.0.19)
+ actionpack (= 3.0.19)
+ activerecord (= 3.0.19)
+ activeresource (= 3.0.19)
+ activesupport (= 3.0.19)
bundler (~> 1.0)
- railties (= 3.0.17)
- railties (3.0.17)
- actionpack (= 3.0.17)
- activesupport (= 3.0.17)
+ railties (= 3.0.19)
+ railties (3.0.19)
+ actionpack (= 3.0.19)
+ activesupport (= 3.0.19)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
@@ -323,7 +323,7 @@ DEPENDENCIES
rabl
rack-contrib
rack-openid
- rails (= 3.0.17)
+ rails (= 3.0.19)
rake (= 0.8.7)
rmagick (= 2.13.1)
rspec-rails (~> 2.4)
View
6 app/controllers/roll_call_controller.rb
@@ -176,7 +176,7 @@ def all
if params[:sort] == 'hotbills'
@sort = 'hotbills'
@rolls = RollCall.find(:all, :include => [:bill, :amendment], :order => 'roll_calls.date DESC',
- :conditions => ['roll_calls.date > ? AND bills.hot_bill_category_id IS NOT NULL',
+ :conditions => ['roll_calls.date >= ? AND bills.hot_bill_category_id IS NOT NULL',
OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]]).paginate :page => @page
elsif params[:sort] == 'keyvotes'
@@ -185,12 +185,12 @@ def all
elsif params[:sort] == 'oldest'
@sort = 'oldest'
@rolls = RollCall.find(:all, :include => [:bill, :amendment], :order => 'date ASC',
- :conditions => ['date > ?', OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]]).paginate :page => @page
+ :conditions => ['date >= ?', OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]]).paginate :page => @page
else
@sort = 'newest'
@rolls = RollCall.find(:all, :include => [:bill, :amendment], :order => 'date DESC',
- :conditions => ['date > ?', OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]]).paginate :page => @page
+ :conditions => ['date >= ?', OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]]).paginate :page => @page
end
@carousel = [ObjectAggregate.popular('RollCall', Settings.default_count_time).slice(0..9)]
View
2  app/models/person.rb
@@ -224,7 +224,7 @@ def self.list_chamber(chamber, congress, order, limit = nil)
GROUP BY object_aggregates.aggregatable_id
ORDER BY view_count DESC) aggregates
ON people.id=aggregates.aggregatable_id
- WHERE roles.role_type = ? AND ((roles.startdate <= ? AND roles.enddate >= ?) OR roles.startdate = '2011-01-05') ORDER BY #{order} #{lim};", chamber, Date.today, Date.today])
+ WHERE roles.role_type = ? AND ((roles.startdate <= ? AND roles.enddate >= ?) OR roles.startdate = ?) ORDER BY #{order} #{lim};", chamber, Date.today, Date.today, OpenCongress::Application::CONGRESS_START_DATES[Settings.default_congress]])
#WHERE roles.role_type = ? AND roles.startdate <= ? AND roles.enddate >= ? ORDER BY #{order} #{lim};", chamber, Date.today, Date.today])
end
View
4 config/application.rb
@@ -66,8 +66,8 @@ class Application < Rails::Application
# following should go in application_settings.yml, but it appears settingslogic
# does not support hashes
CONGRESS_START_DATES = {
- 113 => '2013-01-01',
- 112 => '2011-01-01',
+ 113 => '2013-01-03',
+ 112 => '2011-01-05',
111 => '2009-01-01',
110 => '2007-01-01',
109 => '2005-01-01',
Please sign in to comment.
Something went wrong with that request. Please try again.