Code cleanup.
This commit is contained in:
parent
00bc40e4cb
commit
33777c2bab
24 changed files with 99 additions and 85 deletions
|
@ -739,11 +739,13 @@ class OwnModel < ApplicationModel
|
||||||
serve methode to configure and enable search index support for this model
|
serve methode to configure and enable search index support for this model
|
||||||
|
|
||||||
class Model < ApplicationModel
|
class Model < ApplicationModel
|
||||||
search_index_support ignore_attributes: {
|
search_index_support
|
||||||
|
ignore_attributes: {
|
||||||
create_article_type_id: true,
|
create_article_type_id: true,
|
||||||
create_article_sender_id: true,
|
create_article_sender_id: true,
|
||||||
article_count: true,
|
article_count: true,
|
||||||
}
|
},
|
||||||
|
ignore_ids: [1,2,4]
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -763,7 +765,9 @@ update search index, if configured - will be executed automatically
|
||||||
=end
|
=end
|
||||||
|
|
||||||
def search_index_update
|
def search_index_update
|
||||||
return if !self.class.search_index_support_config
|
config = self.class.search_index_support_config
|
||||||
|
return if !config
|
||||||
|
return if config[:ignore_ids] && config[:ignore_ids].include?(id)
|
||||||
|
|
||||||
# start background job to transfer data to search index
|
# start background job to transfer data to search index
|
||||||
return if !SearchIndexBackend.enabled?
|
return if !SearchIndexBackend.enabled?
|
||||||
|
@ -780,7 +784,10 @@ delete search index object, will be executed automatically
|
||||||
=end
|
=end
|
||||||
|
|
||||||
def search_index_destroy
|
def search_index_destroy
|
||||||
return if !self.class.search_index_support_config
|
config = self.class.search_index_support_config
|
||||||
|
return if !config
|
||||||
|
return if config[:ignore_ids] && config[:ignore_ids].include?(id)
|
||||||
|
|
||||||
SearchIndexBackend.remove(self.class.to_s, id)
|
SearchIndexBackend.remove(self.class.to_s, id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,8 @@ returns
|
||||||
|
|
||||||
lookup name of ref. objects
|
lookup name of ref. objects
|
||||||
|
|
||||||
attributes = search_index_attribute_lookup(attributes, Ticket)
|
ticket = Ticket.find(123)
|
||||||
|
attributes = ticket.search_index_attribute_lookup(attributes, Ticket)
|
||||||
|
|
||||||
returns
|
returns
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Organization
|
||||||
check if user has access to user
|
check if user has access to user
|
||||||
|
|
||||||
user = Organization.find(123)
|
user = Organization.find(123)
|
||||||
result = organization.permission( :type => 'rw', :current_user => User.find(123) )
|
result = organization.permission(type: 'rw', current_user: User.find(123))
|
||||||
|
|
||||||
returns
|
returns
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,8 @@ class Organization
|
||||||
|
|
||||||
lookup name of ref. objects
|
lookup name of ref. objects
|
||||||
|
|
||||||
attributes = search_index_attribute_lookup(attributes, Ticket)
|
organization = Organization.find(123)
|
||||||
|
attributes = organization.search_index_attribute_lookup(attributes, Organization)
|
||||||
|
|
||||||
returns
|
returns
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,8 @@ class User < ApplicationModel
|
||||||
source: true,
|
source: true,
|
||||||
login_failed: true,
|
login_failed: true,
|
||||||
preferences: true,
|
preferences: true,
|
||||||
}
|
},
|
||||||
|
ignore_ids: [1],
|
||||||
)
|
)
|
||||||
|
|
||||||
=begin
|
=begin
|
||||||
|
|
|
@ -79,6 +79,7 @@ returns
|
||||||
if local_group_ids
|
if local_group_ids
|
||||||
local_group_ids.each {|group_id|
|
local_group_ids.each {|group_id|
|
||||||
group = Group.lookup(id: group_id)
|
group = Group.lookup(id: group_id)
|
||||||
|
next if !group
|
||||||
data = group.assets(data)
|
data = group.assets(data)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -94,6 +95,7 @@ returns
|
||||||
if local_organization_ids
|
if local_organization_ids
|
||||||
local_organization_ids.each {|organization_id|
|
local_organization_ids.each {|organization_id|
|
||||||
organization = Organization.lookup(id: organization_id)
|
organization = Organization.lookup(id: organization_id)
|
||||||
|
next if !organization
|
||||||
data = organization.assets(data)
|
data = organization.assets(data)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -105,9 +107,11 @@ returns
|
||||||
if self.organization_id
|
if self.organization_id
|
||||||
if !data[ Organization.to_app_model ] || !data[ Organization.to_app_model ][ self.organization_id ]
|
if !data[ Organization.to_app_model ] || !data[ Organization.to_app_model ][ self.organization_id ]
|
||||||
organization = Organization.lookup(id: self.organization_id)
|
organization = Organization.lookup(id: self.organization_id)
|
||||||
|
if organization
|
||||||
data = organization.assets(data)
|
data = organization.assets(data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
%w(created_by_id updated_by_id).each {|local_user_id|
|
%w(created_by_id updated_by_id).each {|local_user_id|
|
||||||
next if !self[ local_user_id ]
|
next if !self[ local_user_id ]
|
||||||
next if data[ User.to_app_model ][ self[ local_user_id ] ]
|
next if data[ User.to_app_model ][ self[ local_user_id ] ]
|
||||||
|
|
|
@ -8,7 +8,7 @@ class User
|
||||||
check if user has access to user
|
check if user has access to user
|
||||||
|
|
||||||
user = User.find(123)
|
user = User.find(123)
|
||||||
result = user.permission( :type => 'rw', :current_user => User.find(123) )
|
result = user.permission(type: 'rw', current_user: User.find(123))
|
||||||
|
|
||||||
returns
|
returns
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue