@@ -9,7 +9,11 @@ class User < ActiveRecord::Base has_many :topics, :order => "#{Topic.table_name}.created_at desc" has_many :moderatorships, :dependent => :delete_all - has_many :forums, :through => :moderatorships, :source => :forum + has_many :forums, :through => :moderatorships, :source => :forum do + def moderatable + find :all, :select => "#{Forum.table_name}.*, #{Moderatorship.table_name}.id as moderatorship_id" + end + end has_many :monitorships, :dependent => :delete_all has_many :monitored_topics, :through => :monitorships, :source => :topic, :conditions => {"#{Monitorship.table_name}.active" => true} app/models/user.rb @@ -11,7 +11,7 @@ <p><%= 'This user can moderate the following forums. Click one to remove.'[:remove_moderated_forum] %></p> <ul class="flat"> - <% @user.forums.find(:all, :select => "#{Forum.table_name}.*, #{Moderatorship.table_name}.id as moderatorship_id").each do |forum| -%> + <% @user.forums.moderatable.each do |forum| -%> <li> <%= link_to forum.name, moderatorship_path(forum.moderatorship_id), :method => :delete, :confirm => "#{'Remove user as moderator for'[:remove_user_as_moderator]} #{forum.name}?" %> </li> app/views/users/show.html.erb fd89d7b93bf51edd977870663ee84654178126cc courtenay court3nay@gmail.com http://github.com/courtenay/altered_beast/commit/80228688c179a6d05405c653631a4fab5616c006 80228688c179a6d05405c653631a4fab5616c006 2008-10-13T14:56:51-07:00 2008-10-13T14:56:51-07:00 move some sql to the model 51b0cec0a962b809281e0beca15e7b3a1cafeaed courtenay court3nay@gmail.com