db/migrate/20090815015221_add_indexes.rb vendor/plugins/rails_footnotes @@ -1,8 +1,8 @@ {\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf460 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red255\green3\blue0;\red255\green0\blue0;\red0\green0\blue153; -\red255\green15\blue0;\red217\green11\blue0;} -\margl1440\margr1440\margb1800\margt1800\vieww10500\viewh8400\viewkind0 +\red255\green15\blue0;\red217\green11\blue0;\red255\green15\blue0;} +\margl1440\margr1440\margb1800\margt1800\vieww15220\viewh15000\viewkind0 \deftab720 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\sa280\ql\qnatural\pardirnatural @@ -194,7 +194,7 @@ Visual representation of unread topics (including previously read topics with ne \'95 \cf6 \expnd0\expndtw0\kerning0 Ability to mark forums as active (shown/hidden) (mark[oz])\cf0 \expnd0\expndtw0\kerning0 \ - \'95 Ability to mark forums as open (allows new posts) (mark[oz])\ + \'95 \cf7 Ability to mark forums as open (allows new posts) (mark[oz])\cf0 \ \'95 \cf2 \expnd0\expndtw0\kerning0 Customise how many sub forums are shown on the index page (mark[oz])\cf0 \expnd0\expndtw0\kerning0 \ TODO.rtf @@ -32,7 +32,7 @@ class ForumsController < ApplicationController # Shows a forum. # Checks first if the current user can see it. def show - @topics = @forum.topics.sorted.paginate :page => params[:page], :per_page => 30, :order => "sticky DESC" + @topics = @forum.topics.sorted.paginate :page => params[:page], :per_page => per_page @forums = @forum.children @all_forums = Forum.all(:select => "id, title", :order => "title ASC") - [@forum] if current_user.can?(:move_topics, @forum) @moderated_topics_count = @forum.moderations.topics.for_user(current_user).count app/controllers/forums_controller.rb @@ -4,8 +4,9 @@ class Forum < ActiveRecord::Base acts_as_list :scope => :parent_id acts_as_tree :order => :position - named_scope :without_category, :conditions => { :category_id => nil }, :include => :permissions, :order => "position" - named_scope :without_parent, :conditions => { :parent_id => nil }, :include => :permissions, :order => "position" + includes = [:children, :permissions, { :last_post => [:topic, :user] }, :last_post_forum] + named_scope :without_category, :conditions => { :category_id => nil }, :include => includes, :order => "position" + named_scope :without_parent, :conditions => { :parent_id => nil }, :include => includes, :order => "position" named_scope :active, :conditions => { :active => true } app/models/forum.rb @@ -1,4 +1,6 @@ class Topic < ActiveRecord::Base + default_scope :order => "sticky desc" + belongs_to :user belongs_to :ip belongs_to :forum app/models/topic.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090804210918) do +ActiveRecord::Schema.define(:version => 20090815015221) do create_table "banned_ips", :force => true do |t| t.string "ip" @@ -18,6 +18,8 @@ ActiveRecord::Schema.define(:version => 20090804210918) do t.datetime "ban_time" end + add_index "banned_ips", ["ban_time"], :name => "index_banned_ips_on_ban_time" + create_table "categories", :force => true do |t| t.string "name" t.integer "parent_id" @@ -26,6 +28,8 @@ ActiveRecord::Schema.define(:version => 20090804210918) do t.string "description" end + add_index "categories", ["parent_id"], :name => "index_categories_on_parent_id" + create_table "configurations", :force => true do |t| t.string "key" t.string "value" @@ -65,6 +69,7 @@ ActiveRecord::Schema.define(:version => 20090804210918) do add_index "forums", ["category_id"], :name => "index_forums_on_category_id" add_index "forums", ["open"], :name => "index_forums_on_open" + add_index "forums", ["parent_id"], :name => "index_forums_on_parent_id" add_index "forums", ["posts_count"], :name => "index_forums_on_posts_count" add_index "forums", ["topics_count"], :name => "index_forums_on_topics_count" @@ -169,6 +174,10 @@ ActiveRecord::Schema.define(:version => 20090804210918) do t.boolean "can_post_in_closed_forums", :default => false end + add_index "permissions", ["category_id"], :name => "index_permissions_on_category_id" + add_index "permissions", ["forum_id"], :name => "index_permissions_on_forum_id" + add_index "permissions", ["group_id"], :name => "index_permissions_on_group_id" + create_table "posts", :force => true do |t| t.text "text" t.datetime "created_at" @@ -281,5 +290,7 @@ ActiveRecord::Schema.define(:version => 20090804210918) do end add_index "users", ["id", "user_level_id"], :name => "index_users_on_id_and_user_level_id" + add_index "users", ["login"], :name => "index_users_on_login" + add_index "users", ["login_time"], :name => "index_users_on_login_time" end db/schema.rb 0e0ad9632718d80b16ac3b38bee723347a8f3b3a Ryan Bigg radarlistener@gmail.com http://github.com/radar/rboard/commit/2694c8d4f83416eefde4dcd3439e2aa6e6f7ae42 2694c8d4f83416eefde4dcd3439e2aa6e6f7ae42 2009-08-14T19:08:28-07:00 2009-08-14T19:08:28-07:00 Marked off ability to closed forums as complete and added performance enhancements. 11e1986da0e09cf68270a333c2ffdf58f15b8a5f Ryan Bigg radarlistener@gmail.com