Diff
Modified: trunk/Gemfile (3461 => 3462)
--- trunk/Gemfile 2013-03-04 12:32:31 UTC (rev 3461)
+++ trunk/Gemfile 2013-03-04 12:35:10 UTC (rev 3462)
@@ -1,7 +1,7 @@
source "http://rubygems.org"
gem "rails", "2.3.17"
-gem "mysql", "~> 2.8.1"
+gem "mysql2", "~> 0.2.18"
gem "rubyzip", "~> 0.9.4"
gem "oauth", "~> 0.4.3"
gem "libxml-ruby", "2.2.2"
@@ -26,6 +26,5 @@
gem "sunspot_rails", "~> 1.3.3"
gem "sunspot_solr", "~> 1.3.3"
gem "will_paginate", "~> 2.3.16"
-gem "ruby-debug"
gem "open_id_authentication", "~> 1.1.0"
Modified: trunk/config/database.yml.pre (3461 => 3462)
--- trunk/config/database.yml.pre 2013-03-04 12:32:31 UTC (rev 3461)
+++ trunk/config/database.yml.pre 2013-03-04 12:35:10 UTC (rev 3462)
@@ -12,8 +12,8 @@
# And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
- adapter: mysql
- database: m2_development
+ adapter: mysql2
+ database: myexperiment_development
username: root
password:
host: localhost
@@ -22,15 +22,15 @@
# re-generated from your development database when you run 'rake'.
# Do not set this db to the same as development or production.
test:
- adapter: mysql
- database: m2_test
+ adapter: mysql2
+ database: myexperiment_test
username: root
password:
host: localhost
production:
- adapter: mysql
- database: m2_production
+ adapter: mysql2
+ database: myexperiment_production
username: root
password:
host: localhost
Modified: trunk/lib/authorization.rb (3461 => 3462)
--- trunk/lib/authorization.rb 2013-03-04 12:32:31 UTC (rev 3461)
+++ trunk/lib/authorization.rb 2013-03-04 12:35:10 UTC (rev 3462)
@@ -70,9 +70,9 @@
# return the response
case action
- when "view"; return ob.view_permission == "1"
- when "download"; return ob.download_permission == "1"
- when "edit"; return ob.edit_permission == "1"
+ when "view"; return ob.view_permission.to_s == "1"
+ when "download"; return ob.download_permission.to_s == "1"
+ when "edit"; return ob.edit_permission.to_s == "1"
else; return false
end
Modified: trunk/lib/pivoting.rb (3461 => 3462)
--- trunk/lib/pivoting.rb 2013-03-04 12:32:31 UTC (rev 3461)
+++ trunk/lib/pivoting.rb 2013-03-04 12:35:10 UTC (rev 3462)
@@ -315,7 +315,7 @@
plain_label = object.filter_label
if params[:filter_query]
- label.sub!(Regexp.new("(#{params[:filter_query]})", Regexp::IGNORECASE), '<b>\1</b>')
+ label = label.sub(Regexp.new("(#{params[:filter_query]})", Regexp::IGNORECASE), '<b>\1</b>')
end
{