Improved caching.
This commit is contained in:
parent
d3b5cf7586
commit
fb910d03a3
|
@ -35,7 +35,6 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# execute events
|
# execute events
|
||||||
|
@ -160,8 +159,4 @@ class ApplicationController < ActionController::Base
|
||||||
return config
|
return config
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_data_full (user_id)
|
|
||||||
user = User.user_data_full(user_id)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -75,7 +75,7 @@ class SessionsController < ApplicationController
|
||||||
|
|
||||||
# Save the user ID in the session so it can be used in
|
# Save the user ID in the session so it can be used in
|
||||||
# subsequent requests
|
# subsequent requests
|
||||||
user = user_data_full( user_id )
|
user = User.user_data_full( user_id )
|
||||||
|
|
||||||
# auto population of default collections
|
# auto population of default collections
|
||||||
default_collection = default_collections()
|
default_collection = default_collections()
|
||||||
|
|
|
@ -48,13 +48,13 @@ class TicketOverviewsController < ApplicationController
|
||||||
overview[:tickets].each {|ticket|
|
overview[:tickets].each {|ticket|
|
||||||
tickets.push ticket.attributes
|
tickets.push ticket.attributes
|
||||||
if !users[ ticket.owner_id ]
|
if !users[ ticket.owner_id ]
|
||||||
users[ ticket.owner_id ] = user_data_full( ticket.owner_id )
|
users[ ticket.owner_id ] = User.user_data_full( ticket.owner_id )
|
||||||
end
|
end
|
||||||
if !users[ ticket.customer_id ]
|
if !users[ ticket.customer_id ]
|
||||||
users[ ticket.customer_id ] = user_data_full( ticket.customer_id )
|
users[ ticket.customer_id ] = User.user_data_full( ticket.customer_id )
|
||||||
end
|
end
|
||||||
if !users[ ticket.created_by_id ]
|
if !users[ ticket.created_by_id ]
|
||||||
users[ ticket.created_by_id ] = user_data_full( ticket.created_by_id )
|
users[ ticket.created_by_id ] = User.user_data_full( ticket.created_by_id )
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ class TicketOverviewsController < ApplicationController
|
||||||
bulk_owners.each { |user|
|
bulk_owners.each { |user|
|
||||||
bulk_owner_ids.push user.id
|
bulk_owner_ids.push user.id
|
||||||
if !users[ user.id ]
|
if !users[ user.id ]
|
||||||
users[ user.id ] = user_data_full( user.id )
|
users[ user.id ] = User.user_data_full( user.id )
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,20 +100,20 @@ class TicketOverviewsController < ApplicationController
|
||||||
# get related users
|
# get related users
|
||||||
users = {}
|
users = {}
|
||||||
if !users[ticket.owner_id]
|
if !users[ticket.owner_id]
|
||||||
users[ticket.owner_id] = user_data_full(ticket.owner_id)
|
users[ticket.owner_id] = User.user_data_full(ticket.owner_id)
|
||||||
end
|
end
|
||||||
if !users[ticket.customer_id]
|
if !users[ticket.customer_id]
|
||||||
users[ticket.customer_id] = user_data_full(ticket.customer_id)
|
users[ticket.customer_id] = User.user_data_full(ticket.customer_id)
|
||||||
end
|
end
|
||||||
if !users[ticket.created_by_id]
|
if !users[ticket.created_by_id]
|
||||||
users[ticket.created_by_id] = user_data_full(ticket.created_by_id)
|
users[ticket.created_by_id] = User.user_data_full(ticket.created_by_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
owner_ids = []
|
owner_ids = []
|
||||||
ticket.agent_of_group.each { |user|
|
ticket.agent_of_group.each { |user|
|
||||||
owner_ids.push user.id
|
owner_ids.push user.id
|
||||||
if !users[user.id]
|
if !users[user.id]
|
||||||
users[user.id] = user_data_full(user.id)
|
users[user.id] = User.user_data_full(user.id)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ class TicketOverviewsController < ApplicationController
|
||||||
|
|
||||||
# load users
|
# load users
|
||||||
if !users[article.created_by_id]
|
if !users[article.created_by_id]
|
||||||
users[article.created_by_id] = user_data_full(article.created_by_id)
|
users[article.created_by_id] = User.user_data_full(article.created_by_id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -160,20 +160,20 @@ class TicketOverviewsController < ApplicationController
|
||||||
# get related users
|
# get related users
|
||||||
users = {}
|
users = {}
|
||||||
if !users[ticket.owner_id]
|
if !users[ticket.owner_id]
|
||||||
users[ticket.owner_id] = user_data_full(ticket.owner_id)
|
users[ticket.owner_id] = User.user_data_full(ticket.owner_id)
|
||||||
end
|
end
|
||||||
if !users[ticket.customer_id]
|
if !users[ticket.customer_id]
|
||||||
users[ticket.customer_id] = user_data_full(ticket.customer_id)
|
users[ticket.customer_id] = User.user_data_full(ticket.customer_id)
|
||||||
end
|
end
|
||||||
if !users[ticket.created_by_id]
|
if !users[ticket.created_by_id]
|
||||||
users[ticket.created_by_id] = user_data_full(ticket.created_by_id)
|
users[ticket.created_by_id] = User.user_data_full(ticket.created_by_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
owner_ids = []
|
owner_ids = []
|
||||||
ticket.agent_of_group.each { |user|
|
ticket.agent_of_group.each { |user|
|
||||||
owner_ids.push user.id
|
owner_ids.push user.id
|
||||||
if !users[user.id]
|
if !users[user.id]
|
||||||
users[user.id] = user_data_full(user.id)
|
users[user.id] = User.user_data_full(user.id)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ class TicketOverviewsController < ApplicationController
|
||||||
|
|
||||||
# load users
|
# load users
|
||||||
if !users[article.created_by_id]
|
if !users[article.created_by_id]
|
||||||
users[article.created_by_id] = user_data_full(article.created_by_id)
|
users[article.created_by_id] = User.user_data_full(article.created_by_id)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -349,7 +349,7 @@ class TicketOverviewsController < ApplicationController
|
||||||
# get related users
|
# get related users
|
||||||
users = {}
|
users = {}
|
||||||
history.each do |item|
|
history.each do |item|
|
||||||
users[ item['created_by_id'] ] = user_data_full( item['created_by_id'] )
|
users[ item['created_by_id'] ] = User.user_data_full( item['created_by_id'] )
|
||||||
if item['history_object'] == 'Ticket::Article'
|
if item['history_object'] == 'Ticket::Article'
|
||||||
item['type'] = 'Article ' + item['type'].to_s
|
item['type'] = 'Article ' + item['type'].to_s
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class Authorization < ApplicationModel
|
class Authorization < ApplicationModel
|
||||||
belongs_to :user
|
belongs_to :user, :after_add => :cache_update, :after_remove => :cache_update
|
||||||
validates_presence_of :user_id, :uid, :provider
|
validates_presence_of :user_id, :uid, :provider
|
||||||
validates_uniqueness_of :uid, :scope => :provider
|
validates_uniqueness_of :uid, :scope => :provider
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class Group < ApplicationModel
|
class Group < ApplicationModel
|
||||||
has_and_belongs_to_many :users
|
has_and_belongs_to_many :users, :after_add => :cache_update, :after_remove => :cache_update
|
||||||
after_create :cache_delete
|
after_create :cache_delete
|
||||||
after_update :cache_delete
|
after_update :cache_delete
|
||||||
after_destroy :cache_delete
|
after_destroy :cache_delete
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class Role < ApplicationModel
|
class Role < ApplicationModel
|
||||||
has_and_belongs_to_many :users
|
has_and_belongs_to_many :users, :after_add => :cache_update, :after_remove => :cache_update
|
||||||
after_create :cache_delete
|
after_create :cache_delete
|
||||||
after_update :cache_delete
|
after_update :cache_delete
|
||||||
after_destroy :cache_delete
|
after_destroy :cache_delete
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Translation < ApplicationModel
|
class Translation < ActiveRecord::Base
|
||||||
before_create :set_initial
|
before_create :set_initial
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
# clear cache
|
|
||||||
if Zammad::Application.config.cache_store[1] && File.directory?(Zammad::Application.config.cache_store[1])
|
|
||||||
puts 'clear cache...'
|
|
||||||
Rails.cache.clear
|
|
||||||
end
|
|
|
@ -5,7 +5,7 @@ module Cache
|
||||||
end
|
end
|
||||||
def self.write( key, data, params = {} )
|
def self.write( key, data, params = {} )
|
||||||
if !params[:expires_in]
|
if !params[:expires_in]
|
||||||
params[:expires_in] = 48.hours
|
params[:expires_in] = 24.hours
|
||||||
end
|
end
|
||||||
puts 'Cache.write: ' + key.to_s
|
puts 'Cache.write: ' + key.to_s
|
||||||
Rails.cache.write( key.to_s, data, params)
|
Rails.cache.write( key.to_s, data, params)
|
||||||
|
@ -14,4 +14,8 @@ module Cache
|
||||||
puts 'Cache.get: ' + key.to_s
|
puts 'Cache.get: ' + key.to_s
|
||||||
Rails.cache.read( key.to_s )
|
Rails.cache.read( key.to_s )
|
||||||
end
|
end
|
||||||
|
def self.clear
|
||||||
|
puts 'Cache.clear...'
|
||||||
|
Rails.cache.clear
|
||||||
|
end
|
||||||
end
|
end
|
Loading…
Reference in a new issue