Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

[rails.git] / app / views / user / terms.html.erb

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 3b35851991257ee55942dc0f352deafd4b50f5b5..3e93ff20c6dacfda9d9a6a75c7df281137814836 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -13,7 +13,7 @@
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,
-            :url => {:legale => legale, :has_decline => params.has_key?(:user)}
+            :url => {:legale => legale, :has_decline => @user.new_record?}
           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
@@ -22,7 +22,7 @@
 <% end %>
 
 <div id="contributorTerms">
-  <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) }  %>
+  <%= render :partial => "terms", :locals => { :has_decline => @user.new_record? }  %>
 </div>
 
 <% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
@@ -33,15 +33,16 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-    <% if params[:user] %>
+    <% if @user.new_record? %>
       <%= hidden_field('user', 'email') %>
       <%= hidden_field('user', 'email_confirmation') %>
       <%= hidden_field('user', 'display_name') %>
       <%= hidden_field('user', 'pass_crypt') %>
       <%= hidden_field('user', 'pass_crypt_confirmation') %>
+      <%= hidden_field('user', 'openid_url') %>
     <% end %>
     <div id="buttons">
-      <% if params[:user] %>
+      <% if @user.new_record? %>
         <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
       <% end %>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>