Moved message table HTMl to a partial template

[rails.git] / app / controllers / user_preference_controller.rb

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index e9eed12e36ee33ea68bc20e7a85e66a9e2d2c55c..bf9bab213296f1ad4bc3324b480ad89f9a4895cd 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -16,7 +16,7 @@ class UserPreferenceController < ApplicationController
     el1 = XML::Node.new "preferences"
 
     prefs.each do |pref|
     el1 = XML::Node.new "preferences"
 
     prefs.each do |pref|

-      el1 <<  pref.to_xml_node
+      el1 << pref.to_xml_node

     end
 
     doc.root << el1
     end
 
     doc.root << el1


@@ -39,13 +39,13 @@ class UserPreferenceController < ApplicationController
 
     new_preferences = {}
 
 
     new_preferences = {}
 

-    doc = XML::Parser.string(request.raw_post).parse
+    doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse

 
     doc.find("//preferences/preference").each do |pt|
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])
 
     doc.find("//preferences/preference").each do |pt|
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])

-        fail OSM::APIDuplicatePreferenceError.new(pt["k"])
+        raise OSM::APIDuplicatePreferenceError.new(pt["k"])

       else
         preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
       end
       else
         preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
       end