Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #499 - Improved error handling. Fixed Ticket::Overviews.all - use permissions not, not longer role names to decide if user is agent or customer.

Browse source
This commit is contained in:
Martin Edenhofer 2016-12-21 01:00:25 +01:00
parent 4cec7a5549
commit 59c944a945
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/models/ticket/overviews.rb
View file

@ -16,32 +16,31 @@ returns
=end =end
def self.all(data) def self.all(data)
current_user = data[:current_user]
# get customer overviews # get customer overviews
if data[:current_user].role?('Customer') if current_user.permissions?('ticket.customer')
role_id = Role.lookup(name: 'Customer').id overviews = if current_user.organization_id && current_user.organization.shared
overviews = if data[:current_user].organization_id && data[:current_user].organization.shared Overview.where(role_id: current_user.role_ids, active: true).order(:prio)
Overview.where(role_id: role_id, active: true).order(:prio)
else else
Overview.where(role_id: role_id, organization_shared: false, active: true).order(:prio) Overview.where(role_id: current_user.role_ids, organization_shared: false, active: true).order(:prio)
end end
overviews_list = [] overviews_list = []
overviews.each { |overview| overviews.each { |overview|
user_ids = overview.user_ids user_ids = overview.user_ids
next if !user_ids.empty? && !user_ids.include?(data[:current_user].id) next if !user_ids.empty? && !user_ids.include?(current_user.id)
overviews_list.push overview overviews_list.push overview
} }
return overviews_list return overviews_list
end end
# get agent overviews # get agent overviews
return if !data[:current_user].role?('Agent') return [] if !current_user.permissions?('ticket.agent')
role_id = Role.lookup(name: 'Agent').id overviews = Overview.where(role_id: current_user.role_ids, active: true).order(:prio)
overviews = Overview.where(role_id: role_id, active: true).order(:prio)
overviews_list = [] overviews_list = []
overviews.each { |overview| overviews.each { |overview|
user_ids = overview.user_ids user_ids = overview.user_ids
next if !user_ids.empty? && !user_ids.include?(data[:current_user].id) next if !user_ids.empty? && !user_ids.include?(current_user.id)
overviews_list.push overview overviews_list.push overview
} }
overviews_list overviews_list
@ -86,6 +85,7 @@ returns
overviews = Ticket::Overviews.all( overviews = Ticket::Overviews.all(
current_user: user, current_user: user,
) )
return [] if overviews.blank?
# get only tickets with permissions # get only tickets with permissions
access_condition = Ticket.access_condition(user) access_condition = Ticket.access_condition(user)