@@ -1,3 +1,4 @@ +*~ .DS_Store tmp log .gitignore @@ -23,9 +23,11 @@ class Post < ActiveRecord::Base attr_accessible :body def self.search(query, options = {}) + # had to change the other join string since it conflicts when we bring parents in options[:conditions] ||= ["LOWER(#{Post.table_name}.body) LIKE ?", "%#{query}%"] unless query.blank? - options[:select] ||= "#{Post.table_name}.*, #{Topic.table_name}.title as topic_title, #{Forum.table_name}.name as forum_name" - options[:joins] ||= "inner join #{Topic.table_name} on #{Post.table_name}.topic_id = #{Topic.table_name}.id inner join #{Forum.table_name} on #{Topic.table_name}.forum_id = #{Forum.table_name}.id" + options[:select] ||= "#{Post.table_name}.*, #{Topic.table_name}.title as topic_title, f.name as forum_name" + options[:joins] ||= "inner join #{Topic.table_name} on #{Post.table_name}.topic_id = #{Topic.table_name}.id " + + "inner join #{Forum.table_name} as f on #{Topic.table_name}.forum_id = f.id" options[:order] ||= "#{Post.table_name}.created_at DESC" options[:count] ||= {:select => "#{Post.table_name}.id"} paginate options @@ -39,4 +41,4 @@ protected def topic_is_not_locked errors.add_to_base("Topic is locked") if topic && topic.locked? && topic.posts_count > 0 end -end \ No newline at end of file +end app/models/post.rb @@ -92,7 +92,7 @@ describe PostsController, "GET #index (globally)" do it_assigns :posts, :user => nil, :forum => nil, :topic => nil, :parent => nil it_renders :template, :index - + describe PostsController, "(xml)" do define_models spec/controllers/posts_controller_spec.rb @@ -1 +1 @@ -ActiveRecord::Base.send :include, Technoweenie::ActiveRecordContext \ No newline at end of file +ActiveRecord::Base.send :include, Technoweenie::ActiveRecordContext vendor/plugins/active_record_context/init.rb 7a2e3b4a414daf4e37351947eba30facd4be2889 Nick Quaranto nick@quaran.to http://github.com/courtenay/altered_beast/commit/f9d8719ba76b5b9729f31cec6324574b259fba33 f9d8719ba76b5b9729f31cec6324574b259fba33 2008-09-23T21:07:34-07:00 2008-09-23T21:07:34-07:00 Posts controller spec passing with a little search query fixing. 5eca34409903274414f131b856b66c09c37b59d4 Nick Quaranto nick@quaran.to