From 3eb06a43c49cf506e403078a0717ba2676efeaa3 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 20 Feb 2012 14:25:50 -0500 Subject: [PATCH] fixes #324 --- app/controllers/forum_posts_controller.rb | 2 +- app/logical/moderator/ip_addr_search.rb | 5 +++-- app/presenters/post_presenter.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/forum_posts_controller.rb b/app/controllers/forum_posts_controller.rb index aac3d12f3..252dd14cc 100644 --- a/app/controllers/forum_posts_controller.rb +++ b/app/controllers/forum_posts_controller.rb @@ -16,7 +16,7 @@ class ForumPostsController < ApplicationController def index @search = ForumPost.search(params[:search]) - @forum_posts = @search.paginate(params[:page]) + @forum_posts = @search.paginate(params[:page]).order("forum_posts.id desc") respond_with(@forum_posts) end diff --git a/app/logical/moderator/ip_addr_search.rb b/app/logical/moderator/ip_addr_search.rb index 6e3281152..62c720d36 100644 --- a/app/logical/moderator/ip_addr_search.rb +++ b/app/logical/moderator/ip_addr_search.rb @@ -1,9 +1,10 @@ module Moderator class IpAddrSearch - attr_reader :params + attr_reader :params, :errors def initialize(params) @params = params + @errors = [] end def execute @@ -22,7 +23,7 @@ module Moderator def select_all_sql(sql, *params) ActiveRecord::Base.select_all_sql(sql, *params) end - + def search_by_ip_addr(ip_addrs) sums = Hash.new {|h, k| h[k] = 0} diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 3891e1960..5c5b9c69b 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -30,7 +30,7 @@ class PostPresenter < Presenter end def self.margin_left(post) - if post.is_image? && post.image_width > post.image_height && post.image_width.to_i > Danbooru.config.small_image_width + if post.is_image? && post.image_width > post.image_height && post.image_width > Danbooru.config.small_image_width ratio = Danbooru.config.small_image_width.to_f / post.image_height.to_f offset = ((ratio * post.image_width) - Danbooru.config.small_image_width).to_i / 2 return "-#{offset}px"