Skip to content
Merged
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
6 changes: 3 additions & 3 deletions app/avo/resources/feed.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class Avo::Resources::Feed < Avo::BaseResource
# self.includes = []
# self.attachments = []
# self.search = {
# query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
# }
self.search = {
query: -> { query.ransack(title_cont: params[:q], m: "or").result(distinct: false) }
}

def fields
field :id, as: :id
Expand Down
8 changes: 4 additions & 4 deletions app/avo/resources/minister.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class Avo::Resources::Minister < Avo::BaseResource
# self.includes = []
# self.attachments = []
# self.search = {
# query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
# }
#
self.search = {
query: -> { query.ransack(first_name_cont: params[:q], last_name_cont: params[:q], title_cont: params[:q], m: "or").result(distinct: false) }
}

self.title = :compound_name

def fields
Expand Down
6 changes: 3 additions & 3 deletions app/avo/resources/promise.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class Avo::Resources::Promise < Avo::BaseResource
# self.includes = []
# self.attachments = []
# self.search = {
# query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
# }
self.search = {
query: -> { query.ransack(concise_title_cont: params[:q], m: "or").result(distinct: false) }
}

self.title = :concise_title

Expand Down
4 changes: 4 additions & 0 deletions app/models/feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ class Feed < ApplicationRecord

has_many :entries, dependent: :destroy

def self.ransackable_attributes(auth_object = nil)
[ "title" ]
end

def refresh!
# Implement the logic to refresh the feed data
response = HTTP.get(url)
Expand Down
6 changes: 5 additions & 1 deletion app/models/minister.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ class Minister < ApplicationRecord
belongs_to :government
belongs_to :department

def self.ransackable_attributes(auth_object = nil)
[ "first_name", "last_name", "title" ]
end

def compound_name
"{title} (#{full_name})"
"#{title} (#{full_name})"
end

def full_name
Expand Down
4 changes: 4 additions & 0 deletions app/models/promise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ class Promise < ApplicationRecord
has_one :lead_department_promise, -> { where(is_lead: true) }, class_name: "DepartmentPromise"
has_one :lead_department, through: :lead_department_promise, source: :department

def self.ransackable_attributes(auth_object = nil)
[ "concise_title" ]
end

def set_last_evidence_date!
self.last_evidence_date = evidences.where.not(impact: "neutral").map(&:activity).maximum(:published_at)
self.save!(touch: false)
Expand Down
8 changes: 4 additions & 4 deletions test/models/minister_test.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require "test_helper"

class MinisterTest < ActiveSupport::TestCase
# test "that each department has a minister" do
# # Ensure that each department has
# assert_equal 0, Department.all.select { |d| d.minister.nil? }.count
# end
test "that compound_name is correct" do
minister = ministers(:finance_minister)
assert_equal "Deputy Prime Minister and Minister of Finance (Chrystia Freeland)", minister.compound_name
end
end