yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00
Code Issues Releases Wiki Activity

Added force kicking.

Browse source
This commit is contained in:
Gunther Brunner 2014-05-29 17:03:15 +09:00
parent 59261b3c98
commit 4b98da269b
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/app/components/stf/user/group/group-service.js
View file

@ -29,8 +29,8 @@ module.exports = function GroupServiceFactory(
})
}
groupService.kick = function (device) {
if (!device.usable) {
groupService.kick = function (device, force) {
if (!force && !device.usable) {
return Promise.reject(new Error('Device is not usable'))
}

8
res/app/device-list/device-list-details-controller.js
View file

@ -79,6 +79,14 @@ module.exports = function DeviceListCtrlDetails($scope, DeviceService, GroupServ
}
}
$scope.tryToKick = function (device) {
if (device.state === 'busy') {
if (confirm(gettext('Are you sure you want to kick this device?\nCurrently it is being used by ') + device.owner.name)) {
$scope.kick(device, true)
}
}
}
$scope.columns = [
{ title: 'Model', field: 'model', sortable: 'model', filter: {model: 'text'}, visible: true
}

4
res/app/device-list/device-list.jade
View file

@ -54,7 +54,8 @@ div.stf-device-list
"btn-primary": device.state == "using",\
"btn-primary-outline": device.state == "available",\
"btn-warning": device.state == "busy"\
}'
}',
ng-dblclick='tryToKick(device)',
).btn.btn-xs.device-status {{device.state|statusName|translate}}
.clear-fix
@ -95,6 +96,7 @@ div.stf-device-list
"btn-primary-outline": device.state == "available",\
"btn-warning": device.state == "busy"\
}',
ng-dblclick='tryToKick(device)',
ng-click='device.usable && toggle(device)').btn.btn-xs.device-status {{device.state|statusName|translate}}
td(data-title="'Model'|translate", sortable='"model"', filter='{"model": "text"}')