diff --git a/app/assets/javascripts/app/models/overview.js.coffee b/app/assets/javascripts/app/models/overview.js.coffee index 2a18c402e..efe86641e 100644 --- a/app/assets/javascripts/app/models/overview.js.coffee +++ b/app/assets/javascripts/app/models/overview.js.coffee @@ -1,5 +1,5 @@ class App.Overview extends Spine.Model - @configure 'Overview', 'name', 'link', 'prio', 'condition', 'order', 'group_by', 'view', 'user_id', 'organization_shared', 'role_id', 'order', 'group_by' + @configure 'Overview', 'name', 'link', 'prio', 'condition', 'order', 'group_by', 'view', 'user_id', 'organization_shared', 'role_id', 'order', 'group_by', 'active' @extend Spine.Model.Ajax @url: 'api/overviews' @configure_attributes = [ @@ -96,5 +96,4 @@ class App.Overview extends Spine.Model 'link', 'role', 'prio', - 'active', ] \ No newline at end of file diff --git a/app/models/ticket.rb b/app/models/ticket.rb index e9104926d..976ee3adf 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -237,16 +237,16 @@ class Ticket < ApplicationModel if data[:current_user].is_role('Customer') role = data[:current_user].is_role( 'Customer' ) if data[:current_user].organization_id && data[:current_user].organization.shared - overviews = Overview.where( :role_id => role.id ) + overviews = Overview.where( :role_id => role.id, :active => true ) else - overviews = Overview.where( :role_id => role.id, :organization_shared => false ) + overviews = Overview.where( :role_id => role.id, :organization_shared => false, :active => true ) end return overviews end # get agent overviews role = data[:current_user].is_role( 'Agent' ) - overviews = Overview.where( :role_id => role.id ) + overviews = Overview.where( :role_id => role.id, :active => true ) return overviews end