github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix-108-dashboard-no-volumes' into internal

pull/119/head
Anthony Lapenna 2016-08-10 15:41:34 +12:00
parent cf5378f604 24a9e9f61c
commit b89546a1e0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/dashboard/dashboardController.js
View File

@ -50,7 +50,9 @@ function ($scope, $q, Config, Container, Image, Network, Volume, Info) {
function prepareVolumeData(d) { function prepareVolumeData(d) {
var volumes = d.Volumes; var volumes = d.Volumes;
$scope.volumeData.total = volumes.length; if (volumes) {
$scope.volumeData.total = volumes.length;
}
} }
function prepareNetworkData(d) { function prepareNetworkData(d) {

4
gruntFile.js
View File

@ -152,11 +152,11 @@ module.exports = function (grunt) {
} }
}, },
angular: { angular: {
src: ['bower_components/angular/angular.js', src: ['bower_components/angular/angular.min.js',
'bower_components/angular-sanitize/angular-sanitize.min.js', 'bower_components/angular-sanitize/angular-sanitize.min.js',
'bower_components/angular-cookies/angular-cookies.min.js', 'bower_components/angular-cookies/angular-cookies.min.js',
'bower_components/angular-ui-router/release/angular-ui-router.min.js', 'bower_components/angular-ui-router/release/angular-ui-router.min.js',
'bower_components/angular-resource/angular-resource.js', 'bower_components/angular-resource/angular-resource.min.js',
'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js', 'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
'bower_components/angular-ui-select/dist/select.min.js'], 'bower_components/angular-ui-select/dist/select.min.js'],
dest: '<%= distdir %>/js/angular.js' dest: '<%= distdir %>/js/angular.js'