Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/models/result.rb
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ def self.perform_search(q, page=1, per=25, options={})

options ||= {}
include_metadata_column = options[:include_metadata_column] || false
columns = options[:columns]

q.delete("searches_id_in")
options[:metadata_search] = q[:metadata_search]
Expand Down Expand Up @@ -307,7 +306,7 @@ def self.perform_search(q, page=1, per=25, options={})

begin
results = Result.filter_search_with_metadata(ransack_search, per, page, options)
rescue => e
rescue => _e
if(per == nil)
results = ransack_search.result.select(Result.column_names.reject{|c| (c.starts_with("metadata") && include_metadata_column!=true) || c == "content" }.map{|c| "results."+c.to_s})
else
Expand Down
2 changes: 1 addition & 1 deletion app/models/status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Status < ActiveRecord::Base
def set_defaults
self.is_invalid = false if self.is_invalid.nil?
self.closed = false if self.closed.nil?
return true
true
end

def reset_default
Expand Down
2 changes: 1 addition & 1 deletion app/models/subscriber.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ class Subscriber < ActiveRecord::Base
validates :user_id, :uniqueness=> {scope: [:subscribable_id, :subscribable_type, :email]}

def subscriber_email
return user.present? ? user.email : email
user.present? ? user.email : email
end
end