starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-25 18:25:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed kicking in admin mode.

Browse Source
This commit is contained in:
Gunther Brunner
2014-07-14 20:33:09 +09:00
parent fa71aae56a
commit 035384c6e6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/app/device-list/device-list-details-directive.js
View File

@@ -4,6 +4,7 @@ module.exports = function DeviceListDetailsDirective(
DeviceColumnService DeviceColumnService
, GroupService , GroupService
, $filter , $filter
, $rootScope
) { ) {
return { return {
restrict: 'E' restrict: 'E'
@@ -38,7 +39,7 @@ module.exports = function DeviceListDetailsDirective(
var id = e.target.parentNode.parentNode.id var id = e.target.parentNode.parentNode.id
var device = mapping[id] var device = mapping[id]
if (scope.adminMode && device.state === 'busy') { if ($rootScope.adminMode && device.state === 'busy') {
kickDevice(device, true) kickDevice(device, true)
e.preventDefault() e.preventDefault()
} }
@@ -131,7 +132,7 @@ module.exports = function DeviceListDetailsDirective(
// Check what we're supposed to show now // Check what we're supposed to show now
columnSettings.forEach(function(column) { columnSettings.forEach(function(column) {
var skipColumn = scope.adminMode && scope.columnDefinitions[column.name].admin var skipColumn = $rootScope.adminMode && scope.columnDefinitions[column.name].admin
if (skipColumn) { if (skipColumn) {
column.selected = false column.selected = false
return return