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

Fixed not recognised overview sort by prio. Ignore auto generated link on create if already present.

Browse source
This commit is contained in:
Martin Edenhofer 2016-03-12 17:23:51 +01:00
parent 00abecbd98
commit 6b778c27ee
3 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/models/overview.rb
View file

@ -7,22 +7,36 @@ class Overview < ApplicationModel
validates :name, presence: true validates :name, presence: true
validates :prio, presence: true validates :prio, presence: true
before_create :fill_link before_create :fill_link_on_create, :fill_prio
before_update :fill_link before_update :fill_link_on_update
notify_clients_support notify_clients_support
latest_change_support latest_change_support
private private
# fill link def fill_prio
def fill_link return true if prio
prio = 9999
end
def fill_link_on_create
return true if !link.empty?
self.link = link_name(name)
end
def fill_link_on_update
return true if link.empty? return true if link.empty?
return true if !changes['name'] return true if !changes['name']
self.link = name.downcase self.link = link_name(name)
end
def link_name(name)
link = name.downcase
link.gsub!(/\s/, '_') link.gsub!(/\s/, '_')
link.gsub!(/[^0-9a-z]/i, '_') link.gsub!(/[^0-9a-z]/i, '_')
link.gsub!(/_+/, '_') link.gsub!(/_+/, '_')
link
end end
end end

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

@ -21,9 +21,9 @@ returns
if data[:current_user].role?('Customer') if data[:current_user].role?('Customer')
role = Role.find_by(name: 'Customer') role = Role.find_by(name: 'Customer')
overviews = if data[:current_user].organization_id && data[:current_user].organization.shared overviews = if data[:current_user].organization_id && data[:current_user].organization.shared
Overview.where(role_id: role.id, active: true) Overview.where(role_id: role.id, active: true).order(:prio)
else else
Overview.where(role_id: role.id, organization_shared: false, active: true) Overview.where(role_id: role.id, organization_shared: false, active: true).order(:prio)
end end
return overviews return overviews
end end
@ -31,7 +31,7 @@ returns
# get agent overviews # get agent overviews
return if !data[:current_user].role?('Agent') return if !data[:current_user].role?('Agent')
role = Role.find_by(name: 'Agent') role = Role.find_by(name: 'Agent')
Overview.where(role_id: role.id, active: true) Overview.where(role_id: role.id, active: true).order(:prio)
end end
=begin =begin

16
test/browser/agent_ticket_overview_level0_test.rb
View file

@ -30,14 +30,14 @@ class AgentTicketOverviewLevel0Test < TestCase
body: 'overview count test #2', body: 'overview count test #2',
} }
) )
click( text: 'Overviews' ) click(text: 'Overviews')
# enable full overviews # enable full overviews
execute( execute(
js: '$(".content.active .sidebar").css("display", "block")', js: '$(".content.active .sidebar").css("display", "block")',
) )
click( text: 'Unassigned & Open' ) click(text: 'Unassigned & Open')
sleep 8 # till overview is rendered sleep 8 # till overview is rendered
# select both via bulk action # select both via bulk action
@ -87,7 +87,7 @@ class AgentTicketOverviewLevel0Test < TestCase
overview_counter_before = overview_counter() overview_counter_before = overview_counter()
# click options and enable number and article count # click options and enable number and article count
click( css: '.active [data-type="settings"]' ) click(css: '.active [data-type="settings"]')
watch_for( watch_for(
css: '.modal h1', css: '.modal h1',
@ -111,7 +111,7 @@ class AgentTicketOverviewLevel0Test < TestCase
check( check(
css: '.modal input[value="article_count"]', css: '.modal input[value="article_count"]',
) )
click( css: '.modal .js-submit' ) click(css: '.modal .js-submit')
sleep 4 sleep 4
# check if number and article count is shown # check if number and article count is shown
@ -147,7 +147,7 @@ class AgentTicketOverviewLevel0Test < TestCase
) )
# disable number and article count # disable number and article count
click( css: '.active [data-type="settings"]' ) click(css: '.active [data-type="settings"]')
watch_for( watch_for(
css: '.modal h1', css: '.modal h1',
@ -159,7 +159,7 @@ class AgentTicketOverviewLevel0Test < TestCase
uncheck( uncheck(
css: '.modal input[value="article_count"]', css: '.modal input[value="article_count"]',
) )
click( css: '.modal .js-submit' ) click(css: '.modal .js-submit')
sleep 2 sleep 2
# check if number and article count is gone # check if number and article count is gone
@ -188,7 +188,7 @@ class AgentTicketOverviewLevel0Test < TestCase
# get new overview count # get new overview count
overview_counter_new = overview_counter() overview_counter_new = overview_counter()
assert_equal( overview_counter_before['#ticket/view/all_unassigned'] + 1, overview_counter_new['#ticket/view/all_unassigned'] ) assert_equal(overview_counter_before['#ticket/view/all_unassigned'] + 1, overview_counter_new['#ticket/view/all_unassigned'])
# open ticket by search # open ticket by search
ticket_open_by_search( ticket_open_by_search(
@ -206,7 +206,7 @@ class AgentTicketOverviewLevel0Test < TestCase
# get current overview count # get current overview count
overview_counter_after = overview_counter() overview_counter_after = overview_counter()
assert_equal( overview_counter_before['#ticket/view/all_unassigned'], overview_counter_after['#ticket/view/all_unassigned'] ) assert_equal(overview_counter_before['#ticket/view/all_unassigned'], overview_counter_after['#ticket/view/all_unassigned'])
# cleanup # cleanup
tasks_close_all() tasks_close_all()