diff --git a/bower.json b/bower.json index a3dba315..7d36e23e 100644 --- a/bower.json +++ b/bower.json @@ -2,11 +2,11 @@ "name": "stf", "version": "0.1.0", "dependencies": { - "angular": "~1.3.0-beta.11", - "angular-route": "~1.3.0-beta.11", - "angular-sanitize": "~1.3.0-beta.11", - "angular-animate": "~1.3.0-beta.11", - "angular-touch": "~1.3.0-beta.11", + "angular": "~1.3.0-beta.12", + "angular-route": "~1.3.0-beta.12", + "angular-sanitize": "~1.3.0-beta.12", + "angular-animate": "~1.3.0-beta.12", + "angular-touch": "~1.3.0-beta.12", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#46b7dd0792cfdc66bf01e351cd680de88740d60c", "socket.io-client": "~1.0.4", "lodash": "~2.4.1", @@ -44,8 +44,8 @@ }, "private": true, "resolutions": { - "angular": "~1.3.0-beta.11", - "angular-sanitize": "~1.3.0-beta.11", - "angular-touch": "~1.3.0-beta.11" + "angular": "~1.3.0-beta.12", + "angular-sanitize": "~1.3.0-beta.12", + "angular-touch": "~1.3.0-beta.12" } } diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js b/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js index 6a62b24c..1dc9aaa4 100644 --- a/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js +++ b/res/app/control-panes/advanced/port-forwarding/port-forwarding-controller.js @@ -119,7 +119,7 @@ module.exports = function PortForwardingCtrl($scope, ngTableParams, SettingsServ getData: function ($defer, params) { - $defer.resolve($scope.portSets); + $defer.resolve($scope.portSets) } }) } diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade index 5adc0987..4fdaf0c8 100644 --- a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade +++ b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade @@ -34,7 +34,7 @@ input.form-control(type='number', min='0', ng-model='ports.targetPort', ng-change='targetPortChanged(result)', placeholder='{{"Port"|translate}}') - table(ng-table='deviceStatusTable', ng-hide='!devicesStatus.length').table + //table(ng-table='deviceStatusTable', ng-hide='!devicesStatus.length').table tr(ng-repeat='result in $data') td(data-title="'Device'|translate") p {{ result.deviceId }}