Merge 16743:16811 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:50:47 +0000 (23:50 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:50:47 +0000 (23:50 +0000)
12 files changed:
1  2 
app/controllers/user_controller.rb
app/models/notifier.rb
app/models/user.rb
app/views/notifier/reset_password.text.html.erb
app/views/notifier/reset_password.text.plain.erb
app/views/user/reset_password.html.erb
config/locales/de.yml
config/locales/en.yml
db/migrate/038_add_message_sender_index.rb
db/migrate/039_create_oauth_tables.rb
db/migrate/040_add_fine_o_auth_permissions.rb
db/migrate/041_add_foreign_keys_to_oauth_tables.rb

index 1e70fe08f0b1e8f679395cd50f5d2d51040125e7,c3ab012e387edadd0d32f5ba4b380b60a1ead586..6f57f4f4abc3fef272128ce8c084555a9eff12a7
@@@ -98,9 -95,9 +98,9 @@@ class UserController < ApplicationContr
        if user
          token = user.tokens.create
          Notifier.deliver_lost_password(user, token)
--        flash[:notice] = t 'user.lost_password.notice email on way'
++        @notice = t 'user.lost_password.notice email on way'
        else
--        flash[:notice] = t 'user.lost_password.notice email cannot find'
++        @notice = t 'user.lost_password.notice email cannot find'
        end
      end
    end
    def reset_password
      @title = t 'user.reset_password.title'
  
--    if params['token']
++    if params[:token]
        token = UserToken.find_by_token(params[:token])
++
        if token
--        pass = OSM::make_token(8)
--        user = token.user
--        user.pass_crypt = pass
--        user.pass_crypt_confirmation = pass
--        user.active = true
--        user.email_valid = true
--        user.save!
--        token.destroy
--        Notifier.deliver_reset_password(user, pass)
--        flash[:notice] = t 'user.reset_password.flash changed check mail'
++        if params[:user]
++          @user = token.user
++          @user.pass_crypt = params[:user][:pass_crypt]
++          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
++          @user.active = true
++          @user.email_valid = true
++
++          if @user.save
++            token.destroy
++            flash[:notice] = t 'user.reset_password.flash changed'
++            redirect_to :action => 'login'
++          end
++        end
        else
          flash[:notice] = t 'user.reset_password.flash token bad'
++        redirect_to :action => 'lost_password'
        end
      end
--
--    redirect_to :action => 'login'
    end
  
    def new
index ba4530e9927165c6f0cf352e41ae70fbb1bfd437,ba4530e9927165c6f0cf352e41ae70fbb1bfd437..35b521e1fdfdd4918f82f3aa604a97a4f7b331d4
@@@ -22,13 -22,13 +22,7 @@@ class Notifier < ActionMailer::Bas
      subject I18n.t('notifier.lost_password.subject')
      body :url => url_for(:host => SERVER_URL,
                           :controller => "user", :action => "reset_password",
--                         :email => user.email, :token => token.token)
--  end
--
--  def reset_password(user, pass)
--    common_headers user
--    subject I18n.t('notifier.reset_password.subject')
--    body :pass => pass
++                         :token => token.token)
    end
  
    def gpx_success(trace, possible_points)
Simple merge
diff --cc app/views/notifier/reset_password.text.html.erb
index 39ea35b5ef4ea4c776247c4738e2c16fd7ef2750,39ea35b5ef4ea4c776247c4738e2c16fd7ef2750..0000000000000000000000000000000000000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,3 -1,3 +1,0 @@@
--<p><%= t 'notifier.reset_password_html.greeting' %></p>
--
--<p><%= t 'notifier.reset_password_html.reset', :new_password => @pass %></p>
diff --cc app/views/notifier/reset_password.text.plain.erb
index aab4d137b672b144160a944c3f68a9021c867e29,aab4d137b672b144160a944c3f68a9021c867e29..0000000000000000000000000000000000000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,3 -1,3 +1,0 @@@
--<%= t 'notifier.reset_password_plain.greeting' %>
--
--<%= t 'notifier.reset_password_plain.reset', :new_password => @pass %>
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..458a6084cffc7118ab60f5b1e52bd7b04e89bed0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,14 @@@
++<h1><%= t 'user.reset_password.heading' %></h1>
++
++<%= error_messages_for :user %>
++
++<% form_tag do %>
++<%= hidden_field_tag(:token, params[:token]) %>
++<table id="loginForm">
++  <tr><td class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt,{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
++  <tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation,{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
++  
++  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
++  <tr><td></td><td align=right><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>
++</table>
++<% end %>
Simple merge
index 8c685df651e4db4ea38005012c213ac48a4f6916,3b049b12aa91b7949d8fbe2cec93561e6515b2d8..97fe3ab011d1721b5a6128ef02148e83f6a4879e
@@@ -533,14 -533,14 +533,6 @@@ en
        greeting: "Hi,"
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
--    reset_password:
--      subject: "[OpenStreetMap] Password reset"
--    reset_password_plain:
--      greeting: "Hi,"
--      reset: "Your password has been reset to {{new_password}}"
--    reset_password_html:
--      greeting: "Hi,"
--      reset: "Your password has been reset to {{new_password}}"
    message:
      inbox:
        title: "Inbox"
        account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
        auth failure: "Sorry, couldn't log in with those details."
      lost_password:
--      title: "lost password"
++      title: "Lost password"
        heading: "Forgotten Password?"
        email address: "Email Address:"
        new password button: "Send me a new password"
        notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
        notice email cannot find: "Couldn't find that email address, sorry."
      reset_password:
--      title: "reset password"
--      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
++      title: "Reset password"
++      heading: "Reset Password"
++      password: "Password: "
++      confirm password: "Confirm Password: "
++      reset: "Reset Password"
++      flash changed: "Your password has been changed."
        flash token bad: "Didn't find that token, check the URL maybe?"
      new:
        title: "Create account"
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2b9b134cd53ee74989c41a5077ff1d372d6c2de0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,9 @@@
++class AddMessageSenderIndex < ActiveRecord::Migration
++  def self.up
++    add_index :messages, [:from_user_id], :name=> "messages_from_user_id_idx"
++  end
++
++  def self.down
++    drop_index :messages, :name=> "messages_from_user_id_idx"
++  end
++end
index 95d690512300fbcbeaaf9c86509ff74d258cfd8b,0000000000000000000000000000000000000000..95d690512300fbcbeaaf9c86509ff74d258cfd8b
mode 100644,000000..100644
--- /dev/null
index ad4c7a8a4f7bc37580de3ef20b34715825004e13,0000000000000000000000000000000000000000..ad4c7a8a4f7bc37580de3ef20b34715825004e13
mode 100644,000000..100644
--- /dev/null
index 09de54349c26bd477acc187275d56c2e902a2f4c,0000000000000000000000000000000000000000..09de54349c26bd477acc187275d56c2e902a2f4c
mode 100644,000000..100644
--- /dev/null