Merge branch 'develop'

app/assets/javascripts/app/controllers/_default_navbar.js.coffee

@@ -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( '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' )

app/assets/javascripts/app/controllers/navigation.js.coffee

@@ -95,7 +95,7 @@ class App.Navigation extends App.Controller
           # load user collection
           if data.load.users
             App.Collection.load( type: 'User', data: data.load.users )
-          
+
           # load user collection
           if data.load.organizations
             for organization_id, organization of data.load.organizations
@@ -255,7 +255,7 @@ class App.Navigation extends App.Controller
 
       newlist[ item['prio'] ] = item;
 
-    # get keys for sort order    
+    # get keys for sort order
     keys = _.keys(newlist)
     inorder = keys.sort(@sortit)
 
@@ -265,7 +265,7 @@ class App.Navigation extends App.Controller
       inordervalue.push newlist[ num ]
     return inordervalue
 
-  sortit: (a,b) ->  
+  sortit: (a,b) ->
     return(a-b)
 
   addPrioCount: (newlist, item) ->

test/browser/agent_ticket_actions_simple_test.rb

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