@@ -14,9 +14,12 @@ class UsersController < BaseController end end - uses_tiny_mce(:options => AppConfig.default_mce_options.merge({:editor_selector => "rich_text_editor"}), - :only => [:new, :create, :update, :edit, :welcome_about]) - uses_tiny_mce(:options => AppConfig.simple_mce_options, :only => [:show]) + uses_tiny_mce(:only => [:new, :create, :update, :edit, :welcome_about]) do + AppConfig.default_mce_options.merge({:editor_selector => "rich_text_editor"}) + end + uses_tiny_mce(:only => [:show]) do + AppConfig.simple_mce_options + end # Filters before_filter :login_required, :only => [:edit, :edit_account, :update, :welcome_photo, :welcome_about, app/controllers/users_controller.rb @@ -157,7 +157,7 @@ class User < ActiveRecord::Base activities = Activity.since(options[:since]).find(:all, :select => 'activities.user_id, count(*) as count', :group => 'activities.user_id', - :conditions => "#{options[:require_avatar] ? ' users.avatar_id IS NOT NULL' : nil}", + :conditions => "#{options[:require_avatar] ? ' users.avatar_id IS NOT NULL AND ' : ''} users.activated_at IS NOT NULL", :order => 'count DESC', :joins => "LEFT JOIN users ON users.id = activities.user_id", :limit => options[:limit] @@ -181,7 +181,11 @@ class User < ActiveRecord::Base def self.recent_activity(page = {}, options = {}) page.reverse_merge! :size => 10, :current => 1 - Activity.recent.find(:all, :page => page, *options) + Activity.recent.find(:all, + :select => 'activities.*', + :conditions => "users.activated_at IS NOT NULL", + :joins => "LEFT JOIN users ON users.id = activities.user_id", + :page => page, *options) end def self.currently_online @@ -327,7 +331,7 @@ class User < ActiveRecord::Base end def update_last_login - self.track_activity(:logged_in) if self.last_login_at.nil? || (self.last_login_at && self.last_login_at < Time.now.beginning_of_day) + self.track_activity(:logged_in) if self.active? && self.last_login_at.nil? || (self.last_login_at && self.last_login_at < Time.now.beginning_of_day) self.update_attribute(:last_login_at, Time.now) end app/models/user.rb @@ -1,9 +1,17 @@ module TinyMCE module ClassMethods - def uses_tiny_mce(options = {}) + def uses_tiny_mce(options = {}, &block) tiny_mce_options = options.delete(:options) || nil proc = Proc.new do |c| c.instance_variable_set(:@tiny_mce_options, tiny_mce_options) + + # This allows us to pass in a block instead of just a hash, which is important since we want to lazy-evaluate + # AppConfig.default_mce_options to avoid errors when overriding controllers + if block_given? + c.instance_variable_set(:@tiny_mce_options, block.call) + else + c.instance_variable_set(:@tiny_mce_options, tiny_mce_options) + end c.instance_variable_set(:@uses_tiny_mce, true) end before_filter(proc, options) plugins/tiny_mce/lib/tiny_mce.rb @@ -6,7 +6,7 @@ module TinyMCEHelper !@uses_tiny_mce.nil? end - def tiny_mce_init(options = @tiny_mce_options) + def tiny_mce_init(options = @tiny_mce_options ) options ||= {} default_options = {:mode => 'textareas', :theme => 'simple'} plugins/tiny_mce/lib/tiny_mce_helper.rb 15701ae34beeb1e56c063fa93c33b8fabaf2c690 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/21836ef1e9df5051a590f7f1f055f3ef5cd13776 21836ef1e9df5051a590f7f1f055f3ef5cd13776 2009-10-28T12:45:06-07:00 2009-10-28T12:45:06-07:00 allow tiny_mce helper to accept a block to prevent error when overriding controllers 3b619d309f4d8e2cd5f10d686eef4de163a548c3 bborn bruno.bornsztein@gmail.com