gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings

Browse source 
Fix deprecation warnings
This commit is contained in:
Henne Vogelsang 2016-05-19 14:37:39 +02:00
commit 02487be6fb
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Gemfile.lock
View file

@ -212,7 +212,7 @@ GEM
hoptoad_notifier (2.4.11) hoptoad_notifier (2.4.11)
activesupport activesupport
builder builder
htmlentities (4.3.1) htmlentities (4.3.4)
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.7.0) i18n (0.7.0)
@ -254,7 +254,7 @@ GEM
rake rake
mini_magick (4.5.1) mini_magick (4.5.1)
mini_portile2 (2.0.0) mini_portile2 (2.0.0)
minitest (5.8.4) minitest (5.9.0)
momentjs-rails (2.8.1) momentjs-rails (2.8.1)
railties (>= 3.1) railties (>= 3.1)
monetize (1.4.0) monetize (1.4.0)
@ -302,9 +302,10 @@ GEM
rack-openid (~> 1.3.1) rack-openid (~> 1.3.1)
open4 (1.3.4) open4 (1.3.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paper_trail (3.0.1) paper_trail (5.0.1)
activerecord (>= 3.0, < 5.0) activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 5.0) activesupport (>= 3.0, < 6.0)
request_store (~> 1.1)
parser (2.3.0.3) parser (2.3.0.3)
ast (~> 2.2) ast (~> 2.2)
pdf-core (0.2.5) pdf-core (0.2.5)
@ -402,7 +403,7 @@ GEM
yajl-ruby (~> 1.1) yajl-ruby (~> 1.1)
redcarpet (3.2.3) redcarpet (3.2.3)
referer-parser (0.2.1) referer-parser (0.2.1)
request_store (1.0.6) request_store (1.1.0)
responders (2.1.1) responders (2.1.1)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
rest-client (1.8.0) rest-client (1.8.0)

1
app/controllers/application_controller.rb
View file

@ -1,4 +1,5 @@
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
before_filter :set_paper_trail_whodunnit
include ApplicationHelper include ApplicationHelper
add_flash_types :error add_flash_types :error
protect_from_forgery with: :exception protect_from_forgery with: :exception

7
app/views/conference_registrations/_questions.html.haml
View file

@ -1,8 +1,7 @@
= f.inputs 'Additional Info' do = f.inputs 'Additional Info' do
- @conference.questions.each do |q| - @conference.questions.each do |q|
- if q.question_type.id == 1 || q.question_type.id == 2 # yes/no or single choice - if q.question_type.id == 1 || q.question_type.id == 2 # yes/no or single choice
= f.input :qanswers, :collection => q.qanswers, :as => :select, :input_html => { :multiple => false }, label: q.title, :include_blank => "Please make your choice", = f.input :qanswers, :collection => q.qanswers.joins(:answer).pluck("answers.title, qanswers.id"), :as => :select, :input_html => { :multiple => false },
:member_label => Proc.new {|a| a.answer.title} label: q.title, :include_blank => "Please make your choice"
- if q.question_type.id == 3 # multiple choice - if q.question_type.id == 3 # multiple choice
= f.input :qanswers, :collection => q.qanswers, :as => :check_boxes, label: q.title, = f.input :qanswers, :collection => q.qanswers.joins(:answer).pluck("answers.title, qanswers.id"), :as => :check_boxes, label: q.title
:member_label => Proc.new {|a| a.answer.title}

2
config/initializers/paper_trail.rb Normal file
View file

@ -0,0 +1,2 @@
# Tracking associations is an experimental feature and it is recommended to set it to false
PaperTrail.config.track_associations = false