Code cleanup.

This commit is contained in:
Martin Edenhofer 2016-03-08 07:32:58 +01:00
parent 00bc40e4cb
commit 33777c2bab
24 changed files with 99 additions and 85 deletions

View file

@ -739,11 +739,13 @@ class OwnModel < ApplicationModel
serve methode to configure and enable search index support for this model
class Model < ApplicationModel
search_index_support ignore_attributes: {
search_index_support
ignore_attributes: {
create_article_type_id: true,
create_article_sender_id: true,
article_count: true,
}
},
ignore_ids: [1,2,4]
end
@ -763,7 +765,9 @@ update search index, if configured - will be executed automatically
=end
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
return if !SearchIndexBackend.enabled?
@ -780,7 +784,10 @@ delete search index object, will be executed automatically
=end
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)
end

View file

@ -74,7 +74,8 @@ returns
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

View file

@ -8,7 +8,7 @@ class Organization
check if user has access to user
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

View file

@ -7,7 +7,8 @@ class Organization
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

View file

@ -70,7 +70,8 @@ class User < ApplicationModel
source: true,
login_failed: true,
preferences: true,
}
},
ignore_ids: [1],
)
=begin

View file

@ -79,6 +79,7 @@ returns
if local_group_ids
local_group_ids.each {|group_id|
group = Group.lookup(id: group_id)
next if !group
data = group.assets(data)
}
end
@ -94,6 +95,7 @@ returns
if local_organization_ids
local_organization_ids.each {|organization_id|
organization = Organization.lookup(id: organization_id)
next if !organization
data = organization.assets(data)
}
end
@ -105,9 +107,11 @@ returns
if self.organization_id
if !data[ Organization.to_app_model ] || !data[ Organization.to_app_model ][ self.organization_id ]
organization = Organization.lookup(id: self.organization_id)
if organization
data = organization.assets(data)
end
end
end
%w(created_by_id updated_by_id).each {|local_user_id|
next if !self[ local_user_id ]
next if data[ User.to_app_model ][ self[ local_user_id ] ]

View file

@ -8,7 +8,7 @@ class User
check if user has access to user
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