layout.rb in ginjo-rfm-2.1.7

- old
+ new

@@ -208,11 +208,11 @@
 	    #
 	    #   myLayout.find 54321
 	    #
 	    def find(find_criteria, options = {})
 	    	#puts "layout.find-#{self.object_id}"
-	    	options.merge!({:field_mapping => field_mapping}) if field_mapping
+	    	options.merge!({:field_mapping => field_mapping.invert}) if field_mapping
 				get_records(*Rfm::CompoundQuery.new(find_criteria, options))
 	    end
 	    
 	    # Access to raw -findquery command.
 	    def query(query_hash, options = {})
@@ -274,9 +274,10 @@
 	      include_portals = !options[:ignore_portals]
 	      
 	      # Apply mapping from :field_mapping, to send correct params in URL.
 	      prms = params.merge(extra_params)
 	      map = field_mapping.invert
+	      options.merge!({:field_mapping => map}) if map
 	      # TODO: Make this part handle string AND symbol keys.
 	      #map.each{|k,v| prms[k]=prms.delete(v) if prms[v]}
 	      prms.dup.each_key{|k| prms[map[k.to_s]]=prms.delete(k) if map[k.to_s]}
 	      
 	      xml_response = server.connect(state[:account_name], state[:password], action, prms, options).body
\ No newline at end of file