fixes #257
This commit is contained in:
@@ -18,6 +18,9 @@ class Dmail < ActiveRecord::Base
|
|||||||
scope :search_message, lambda {|query| where(["message_index @@ plainto_tsquery(?)", query])}
|
scope :search_message, lambda {|query| where(["message_index @@ plainto_tsquery(?)", query])}
|
||||||
scope :unread, where("is_read = false and is_deleted = false")
|
scope :unread, where("is_read = false and is_deleted = false")
|
||||||
scope :visible, lambda {where("(to_id = ? or from_id = ?)", CurrentUser.id, CurrentUser.id)}
|
scope :visible, lambda {where("(to_id = ? or from_id = ?)", CurrentUser.id, CurrentUser.id)}
|
||||||
|
scope :to_name_matches, lambda {|name| where("to_id = (select _.id from users _ where lower(_.name) = ?)", name.downcase)}
|
||||||
|
scope :from_name_matches, lambda {|name| where("from_id = (select _.id from users _ where lower(_.name) = ?)", name.downcase)}
|
||||||
|
search_method :to_name_matches, :from_name_matches
|
||||||
|
|
||||||
module AddressMethods
|
module AddressMethods
|
||||||
def to_name
|
def to_name
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ class User < ActiveRecord::Base
|
|||||||
scope :admins, where("is_admin = TRUE")
|
scope :admins, where("is_admin = TRUE")
|
||||||
scope :with_email, lambda {|email| email.blank? ? where("FALSE") : where(["email = ?", email])}
|
scope :with_email, lambda {|email| email.blank? ? where("FALSE") : where(["email = ?", email])}
|
||||||
scope :find_for_password_reset, lambda {|name, email| email.blank? ? where("FALSE") : where(["name = ? AND email = ?", name, email])}
|
scope :find_for_password_reset, lambda {|name, email| email.blank? ? where("FALSE") : where(["name = ? AND email = ?", name, email])}
|
||||||
|
search_method :named
|
||||||
|
|
||||||
module BanMethods
|
module BanMethods
|
||||||
def validate_ip_addr_is_not_banned
|
def validate_ip_addr_is_not_banned
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
<%= hidden_field_tag :folder, params[:folder] %>
|
<%= hidden_field_tag :folder, params[:folder] %>
|
||||||
<%= f.input :title_contains, :required => false, :label => "Title" %>
|
<%= f.input :title_contains, :required => false, :label => "Title" %>
|
||||||
<%= f.input :body_contains, :required => false, :label => "Body" %>
|
<%= f.input :body_contains, :required => false, :label => "Body" %>
|
||||||
<%= f.input :to_name_equals, :required => false, :label => "To" %>
|
<%= f.input :to_name_matches, :required => false, :label => "To" %>
|
||||||
<%= f.input :from_name_equals, :required => false, :label => "From" %>
|
<%= f.input :from_name_matches, :required => false, :label => "From" %>
|
||||||
<%= f.button :submit, "Search" %>
|
<%= f.button :submit, "Search" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user