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

Merge branch 'develop'

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-01 01:53:32 +02:00
commit 5a6b7d2d15
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_default_navbar.js.coffee
View file

@ -11,4 +11,4 @@ App.Config.set( 'User', {
App.Config.set( 'Admin', { prio: 10000, parent: '', name: 'Manage', target: '#admin', role: ['Admin'] }, 'NavBar' ) App.Config.set( 'Admin', { prio: 10000, parent: '', name: 'Manage', target: '#admin', role: ['Admin'] }, 'NavBar' )
App.Config.set( 'Setting', { prio: 20000, parent: '', name: 'Settings', target: '#settings', role: ['Admin'] }, 'NavBar' ) App.Config.set( 'Setting', { prio: 20000, parent: '', name: 'Settings', target: '#settings', role: ['Admin'] }, 'NavBar' )
App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools' }, 'NavBar' ) App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true }, 'NavBar' )

6
test/browser/agent_ticket_actions_simple_test.rb
View file

@ -300,6 +300,12 @@ class AgentTicketActionSimpleTest < TestCase
:value => 'test to merge', :value => 'test to merge',
:match_result => true, :match_result => true,
}, },
# close task/cleanup
{
:execute => 'click',
:css => '#task [data-type="close"]',
},
], ],
}, },
] ]