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

Added error message when port forwarding fails.

Browse Source 
Disabled port forwarding on user service for now.
This commit is contained in:
Gunther Brunner
2014-06-24 14:27:25 +09:00
parent b37601486e
commit a8da19472d
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
res/app/components/stf/user/user-service.js
View File

@@ -1,4 +1,4 @@
module.exports = function UserServiceFactory($http, $rootScope, socket) { module.exports = function UserServiceFactory($http, $rootScope, socket, $timeout) {
var userService = {} var userService = {}
userService.user = (function () { userService.user = (function () {
@@ -8,23 +8,24 @@ module.exports = function UserServiceFactory($http, $rootScope, socket) {
} }
})() })()
socket.on('forward.create', function(data) { // TODO: Disabled for now
userService.user().then(function(user) { // socket.on('forward.create', function (data) {
$rootScope.$apply(function() { // userService.user().then(function (user) {
user.forwards.push(data) // $timeout(function () {
}) // user.forwards.push(data)
}) // })
}) // })
// })
socket.on('forward.remove', function(data) { //
userService.user().then(function(user) { // socket.on('forward.remove', function (data) {
$rootScope.$apply(function() { // userService.user().then(function (user) {
user.forwards = user.forwards.filter(function(forward) { // $timeout(function () {
return forward.devicePort !== data.devicePort // user.forwards = user.forwards.filter(function (forward) {
}) // return forward.devicePort !== data.devicePort
}) // })
}) // })
}) // })
// })
return userService return userService
} }

8
res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js
View File

@@ -1,6 +1,6 @@
var _ = require('lodash') var _ = require('lodash')
module.exports = function PortForwardingCtrl($scope, ngTableParams, SettingsService) { module.exports = function PortForwardingCtrl($scope, ngTableParams, SettingsService, gettext) {
$scope.forwarding = false $scope.forwarding = false
@@ -23,6 +23,9 @@ module.exports = function PortForwardingCtrl($scope, ngTableParams, SettingsServ
_.forEach(getPortSets(), function (portSet) { _.forEach(getPortSets(), function (portSet) {
$scope.control.createForward(portSet).then(function (result) { $scope.control.createForward(portSet).then(function (result) {
console.log(result) console.log(result)
if (result.error === 'fail_forward') {
alert(gettext('Error: Forwarding ports failed.'))
}
}).catch(function (err) { }).catch(function (err) {
console.error(err) console.error(err)
}) })
@@ -33,6 +36,9 @@ module.exports = function PortForwardingCtrl($scope, ngTableParams, SettingsServ
_.forEach(getPortSets(), function (portSet) { _.forEach(getPortSets(), function (portSet) {
$scope.control.removeForward(portSet).then(function (result) { $scope.control.removeForward(portSet).then(function (result) {
console.log(result) console.log(result)
if (result.error) {
alert(result.error)
}
}).catch(function (err) { }).catch(function (err) {
console.error(err) console.error(err)
}) })