From cce3fe0b644384f7ca476bd839b5ffc33c634e55 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 16 Nov 2011 13:12:02 -0500 Subject: [PATCH] added constraint for fav search --- app/assets/stylesheets/mobile.css.scss | 7 ---- .../stylesheets/mobile/000_vars.css.scss | 7 ---- .../stylesheets/mobile/010_reset.css.scss | 10 ------ .../stylesheets/mobile/main_layout.css.scss | 9 ------ .../stylesheets/mobile/page_header.css.scss | 13 -------- .../stylesheets/mobile/paginator.css.scss | 14 -------- app/assets/stylesheets/mobile/posts.css.scss | 32 ------------------- app/models/favorite.rb | 2 +- app/models/user.rb | 2 +- script/upgrade_schema.sql | 4 +-- 10 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 app/assets/stylesheets/mobile.css.scss delete mode 100644 app/assets/stylesheets/mobile/000_vars.css.scss delete mode 100644 app/assets/stylesheets/mobile/010_reset.css.scss delete mode 100644 app/assets/stylesheets/mobile/main_layout.css.scss delete mode 100644 app/assets/stylesheets/mobile/page_header.css.scss delete mode 100644 app/assets/stylesheets/mobile/paginator.css.scss delete mode 100644 app/assets/stylesheets/mobile/posts.css.scss diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss deleted file mode 100644 index e36b70df8..000000000 --- a/app/assets/stylesheets/mobile.css.scss +++ /dev/null @@ -1,7 +0,0 @@ -/* - *= require "smoothness/jquery-ui-1.8.5.custom.css" - *= require_self - *= require_tree "./common" - *= require_tree "./specific" - *= require_tree "./mobile" -*/ diff --git a/app/assets/stylesheets/mobile/000_vars.css.scss b/app/assets/stylesheets/mobile/000_vars.css.scss deleted file mode 100644 index 8a672afce..000000000 --- a/app/assets/stylesheets/mobile/000_vars.css.scss +++ /dev/null @@ -1,7 +0,0 @@ -$h1_size: 4em; -$h2_size: 3em; -$h3_size: 2em; -$h1_padding: 1.25em 0; -$h2_padding: 1.45833em 0; -$h3_padding: 1.51785em 0; -$baseline: 1em; diff --git a/app/assets/stylesheets/mobile/010_reset.css.scss b/app/assets/stylesheets/mobile/010_reset.css.scss deleted file mode 100644 index e1fe83b45..000000000 --- a/app/assets/stylesheets/mobile/010_reset.css.scss +++ /dev/null @@ -1,10 +0,0 @@ -h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; -/* font-weight: normal;*/ - font-style: normal; - font-size: 130%; - line-height: 1.25em; - font-family: inherit; -} diff --git a/app/assets/stylesheets/mobile/main_layout.css.scss b/app/assets/stylesheets/mobile/main_layout.css.scss deleted file mode 100644 index 20ed16a13..000000000 --- a/app/assets/stylesheets/mobile/main_layout.css.scss +++ /dev/null @@ -1,9 +0,0 @@ -div#page { - aside#sidebar { - width: 30%; - } - - section#content { - width: 65%; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/page_header.css.scss b/app/assets/stylesheets/mobile/page_header.css.scss deleted file mode 100644 index 10b384f42..000000000 --- a/app/assets/stylesheets/mobile/page_header.css.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "../common/000_vars.css.scss"; - -header#top { - h1 { - margin: 5px 30px 0 30px; - } - - menu { - li.nonessential { - display: none; - } - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/paginator.css.scss b/app/assets/stylesheets/mobile/paginator.css.scss deleted file mode 100644 index 72c5117ab..000000000 --- a/app/assets/stylesheets/mobile/paginator.css.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import "../common/000_vars.css.scss"; - -div.paginator { - font-weight: bold; - - li { - margin: 1em 0; - } - - a, span { - padding: 0.5em 1em; - font-weight: bold; - } -} diff --git a/app/assets/stylesheets/mobile/posts.css.scss b/app/assets/stylesheets/mobile/posts.css.scss deleted file mode 100644 index 300c821a1..000000000 --- a/app/assets/stylesheets/mobile/posts.css.scss +++ /dev/null @@ -1,32 +0,0 @@ -@import "../common/000_vars.css.scss"; - -div#c-posts { - section#mode-box { - display: none; - } - - section#tag-box { - ul { - font-weight: bold; - - li { - margin: 0.5em 0; - } - } - } - - a.search-tag { - } - - a.search-inc-tag { - display: none; - } - - a.search-exl-tag { - display: none; - } - - span.post-count { - display: none; - } -} \ No newline at end of file diff --git a/app/models/favorite.rb b/app/models/favorite.rb index 4798cb231..198bbdccc 100644 --- a/app/models/favorite.rb +++ b/app/models/favorite.rb @@ -1,4 +1,4 @@ class Favorite < ActiveRecord::Base belongs_to :post - scope :for_user, lambda {|user_id| where("user_id = #{user_id}")} + scope :for_user, lambda {|user_id| where("user_id % 100 = #{user_id.to_i % 100} and user_id = #{user_id.to_i}")} end diff --git a/app/models/user.rb b/app/models/user.rb index 1e9717c77..7d60cc63e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -176,7 +176,7 @@ class User < ActiveRecord::Base module FavoriteMethods def favorites - Favorite.where("user_id = ?", id).order("id desc") + Favorite.where("user_id % 100 = #{id % 100} and user_id = #{id}").order("id desc") end def add_favorite!(post) diff --git a/script/upgrade_schema.sql b/script/upgrade_schema.sql index 272056799..ebfd631f2 100644 --- a/script/upgrade_schema.sql +++ b/script/upgrade_schema.sql @@ -3043,7 +3043,7 @@ drop function trg_posts_tags__insert(); alter table post_appeals rename column user_id to creator_id; alter index index_post_appeals_on_user_id rename to index_post_appeals_on_creator_id; alter table post_appeals rename column ip_addr to creator_ip_addr; -alter index index_post_appeals_on_ip_addr to index_post_appeals_on_creator_ip_addr; +alter index index_post_appeals_on_ip_addr rename to index_post_appeals_on_creator_ip_addr; create index index_post_flags_on_creator_id on post_flags (creator_id); create index index_post_flags_on_creator_ip_addr on post_flags (creator_ip_addr); @@ -3146,7 +3146,7 @@ alter table users add column favorite_count integer not null default 0; alter table users add column post_upload_count integer not null default 0; alter table users drop column invite_count; alter table users alter column last_logged_in_at drop not null; -alter table users alter column last_forum_at drop not null; +alter table users alter column last_forum_read_at drop not null; alter table users rename column upload_limit to base_upload_limit; alter table users drop column uploaded_tags; alter index idx_users__name rename to index_users_on_name;