adapt to rails 4

Leandro Santos
1 parent b5297b8b
Showing 2 changed files with 6 additions and 7 deletions Show diff stats
lib/pairwise/question.rb
lib/pairwise_plugin.rb
@@ -5,13 +5,11 @@ class Pairwise::Question &lt; ActiveResource::Base
   self.format = :xml
  
   def get_choices(filter=nil, order=nil)
-    Pairwise::Choice.find(
-      :all,
-      :params => {
-        :question_id => self.id,
-        :filter => filter,
-        :order => order
-      })
+    params = {}
+    params[:question_id] = self.id
+    params[:order] = order
+    params[:filter] = filter unless filter.nil?
+    Pairwise::Choice.find(:all, :params => params)
   end
  
   def choices_include_inactive
+require 'active_resource'
 class PairwisePlugin < Noosfero::Plugin
  
   def self.plugin_name
...	...	@@ -5,13 +5,11 @@ class Pairwise::Question < ActiveResource::Base
5	5	self.format = :xml
6	6
7	7	def get_choices(filter=nil, order=nil)
8		- Pairwise::Choice.find(
9		- :all,
10		- :params => {
11		- :question_id => self.id,
12		- :filter => filter,
13		- :order => order
14		- })
	8	+ params = {}
	9	+ params[:question_id] = self.id
	10	+ params[:order] = order
	11	+ params[:filter] = filter unless filter.nil?
	12	+ Pairwise::Choice.find(:all, :params => params)
15	13	end
16	14
17	15	def choices_include_inactive
...	...
	1	+require 'active_resource'
1	2	class PairwisePlugin < Noosfero::Plugin
2	3
3	4	def self.plugin_name
...	...