@@ -314,7 +314,7 @@ class UsersController < BaseController def forgot_password return unless request.post? - @user = User.find_by_email(params[:email]) + @user = User.active.find_by_email(params[:email]) if @user && @user.reset_password UserNotifier.deliver_reset_password(@user) @user.save @@ -328,7 +328,7 @@ class UsersController < BaseController def forgot_username return unless request.post? - if @user = User.find_by_email(params[:email]) + if @user = User.active.find_by_email(params[:email]) UserNotifier.deliver_forgot_username(@user) redirect_to login_url flash[:info] = :your_username_was_emailed_to_you.l app/controllers/users_controller.rb @@ -5,7 +5,7 @@ class Comment < ActiveRecord::Base belongs_to :recipient, :class_name => "User", :foreign_key => "recipient_id" validates_presence_of :comment - # validates_presence_of :recipient + validates_presence_of :commentable_id, :commentable_type validates_length_of :comment, :maximum => 2000 app/models/comment.rb @@ -30,7 +30,7 @@ = f.text_field :author_email, :size => 35 %br %label - =f.check_box :notify_by_email + =f.check_box :notify_by_email, :style => 'width: 10px;' =:notify_me_of_follow_ups_via_email.l %label{"for"=>"comment[author_url"} app/views/comments/_comment_form.html.haml @@ -68,6 +68,9 @@ rss '/site_index.rss', :controller => 'base', :action => 'site_index', :format = advertise '/advertise', :controller => 'base', :action => 'advertise' css_help '/css_help', :controller => 'base', :action => 'css_help' +about '/about', :controller => 'base', :action => 'about' +faq '/faq', :controller => 'base', :action => 'faq' + edit_account_from_email '/account/edit', :controller => 'users', :action => 'edit_account' config/desert_routes.rb @@ -556,7 +556,7 @@ #en: sorry_there_was_an_error_requesting_friendship: Sorry, there was an error requesting friendship. #en: sorry_there_was_an_error_uploading_the_photo: Sorry, there was an error uploading the photo. #en: sorry_we_dont_have_any_pros_in_this_skill_category_yet: Sorry, we don't have any pros in this skill category yet. -#en: sorry_we_dont_recognize_that_email_address: Sorry. We don't recognize that email address. +#en: sorry_we_dont_recognize_that_email_address: "Sorry. That e-mail address is not associated with an active account. Are you sure you typed it correctly? Have you signed up and activated your account?" #en: spread_the_word: Spread the word #en: start_date: Start date #en: start_time: Start time lang/base.yml @@ -1129,8 +1129,8 @@ en: sorry_there_was_an_error_uploading_the_photo: "Sorry, there was an error uploading the photo." #en: sorry_we_dont_have_any_pros_in_this_skill_category_yet: "Sorry, we don't have any pros in this skill category yet." sorry_we_dont_have_any_pros_in_this_skill_category_yet: "Sorry, we don't have any pros in this skill category yet." - #en: sorry_we_dont_recognize_that_email_address: "Sorry. We don't recognize that email address." - sorry_we_dont_recognize_that_email_address: "Sorry. We don't recognize that email address." + #en: sorry_we_dont_recognize_that_email_address: "Sorry. That e-mail address is not associated with an active account. Are you sure you typed it correctly? Have you signed up and activated your account?" + sorry_we_dont_recognize_that_email_address: "Sorry. That e-mail address is not associated with an active account. Are you sure you typed it correctly? Have you signed up and activated your account?" #en: spread_the_word: Spread the word spread_the_word: Spread the word #en: start_date: Start date lang/ui/en-US.yml @@ -3,7 +3,8 @@ ActionView::Base.send :include, WhiteListHelper ActiveRecord::Base.send :include, WhiteListHelper ActiveRecord::Base.class_eval do - include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper + include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper, ActionView::Helpers::UrlHelper + def self.format_attribute(attr_name) class << self; include ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper, WhiteListHelper; end define_method(:body) { read_attribute attr_name } plugins/white_list/init.rb @@ -185,8 +185,8 @@ function FileProgress(fileObj, target_id) { FadeIn(this.fileProgressWrapper, 0); } else { - this.fileProgressElement = this.fileProgressWrapper.down('div'); - this.fileProgressElement.childNodes[1].firstChild.nodeValue = fileObj.name; + this.fileProgressElement = $(this.fileProgressWrapper).down('div'); + this.fileProgressElement.childNodes[1].firstChild.nodeValue = fileObj.name; } this.height = this.fileProgressWrapper.offsetHeight; public/javascripts/uploader.js @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' class CommentsControllerTest < ActionController::TestCase -# class CommentsControllerTest < ActiveSupport::TestCase fixtures :users, :photos, :posts, :comments, :roles def setup test/functional/comments_controller_test.rb @@ -5,8 +5,8 @@ class MonitorshipsControllerTest < ActionController::TestCase all_fixtures def test_should_require_login - post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id, :format => 'js' - assert_js_redirected_to login_path + post :create, :forum_id => forums(:rails).id, :topic_id => topics(:pdi).id, :id => users(:aaron).id + assert_redirected_to login_path end def test_should_add_monitorship @@ -16,7 +16,7 @@ class MonitorshipsControllerTest < ActionController::TestCase assert_response :success end - assert topics(:pdi).monitors(true).include?(users(:joe)) + assert topics(:pdi).monitors.include?(users(:joe)) end def test_should_activate_monitorship test/functional/monitorships_controller_test.rb @@ -65,6 +65,15 @@ class SessionsControllerTest < ActionController::TestCase get :new assert !@controller.send(:logged_in?) end + + def test_should_login_with_reset_password + quentin = users(:quentin) + quentin.reset_password + newpass = quentin.password + quentin.save! + post :create, :login => 'quentin', :password => newpass + assert session[:user] + end protected def auth_token(token) test/functional/sessions_controller_test.rb a7a736fb6d0676018559644e17ceb0834e41a63f c295146b15b09f412156b996499f25f899766640 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/ce994e23794346f86fdfc5ea29a1a51a36b7096e ce994e23794346f86fdfc5ea29a1a51a36b7096e 2009-09-15T12:08:52-07:00 2009-09-15T12:08:52-07:00 Merge branch 'edge' into eksatx/TRY-pages/master 78c54e7cb043780539d271d609b11bb45eb18697 bborn bruno.bornsztein@gmail.com