refinerycms 0.9.6.26 → 0.9.6.27

data/VERSION

@@ -1 +1 @@
-0.9.6.26
+0.9.6.27

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.26' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.27' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/db/migrate/20100305023036_change_users_columns_for_authlogic.rb

@@ -2,6 +2,14 @@ class ChangeUsersColumnsForAuthlogic < ActiveRecord::Migration
   def self.up
     # Change users table to use Authlogic-compatible schema
     change_table "users" do |t|
+      User.all(:conditions => "`users`.reset_code IS NULL").each do |user|
+        new_code = Authlogic::Random.friendly_token
+        user.update_attribute(:reset_code, new_code)
+      end
+      User.all(:conditions => "`users`.remember_token IS NULL").each do |user|
+        new_code = Authlogic::Random.friendly_token
+        user.update_attribute(:remember_token, new_code)
+      end
       t.change    :login             , :string , :null => false                # optional , you can use email instead             , or both
       t.change    :email             , :string , :null => false                # optional , you can use login instead             , or both
       t.change    :crypted_password  , :string , :null => false                # optional , see below

data/public/javascripts/refinery/admin.js

@@ -32,7 +32,7 @@ init_flash_messages = function(){
 }
 
 init_modal_dialogs = function(){
-  $('a[href*="dialog=true"]').each(function(i, anchor)
+  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor)
   {
     $(anchor).click(function(e){
       iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>");

data/vendor/plugins/authentication/app/controllers/users_controller.rb

@@ -52,8 +52,8 @@ class UsersController < ApplicationController
   def forgot
     if request.post?
       if (user = User.find_by_email(params[:user][:email])).present?
-        flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
         user.deliver_password_reset_instructions!(request)
+        flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
         redirect_back_or_default forgot_url
       else
         flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any accounts. Are you sure you typed the correct email address?"

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 26
-  version: 0.9.6.26
+  - 27
+  version: 0.9.6.27
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +12:00
+date: 2010-04-13 00:00:00 +12:00
 default_executable: 
 dependencies: []