mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 05:01:46 +00:00
Only show more button on list pages if scope.moreClick defined
Remove placeholder thumbnails from pod listing page of web ui Show pods when there are no labels
This commit is contained in:
@@ -16,7 +16,6 @@ app.controller('ListPodsCtrl', [
|
||||
$scope.serverView = false;
|
||||
|
||||
$scope.headers = [
|
||||
{name: '', field: 'thumb'},
|
||||
{name: 'Pod', field: 'pod'},
|
||||
{name: 'IP', field: 'ip'},
|
||||
{name: 'Status', field: 'status'},
|
||||
@@ -36,7 +35,6 @@ app.controller('ListPodsCtrl', [
|
||||
status: 'grey'
|
||||
};
|
||||
$scope.sortable = ['pod', 'ip', 'status'];
|
||||
$scope.thumbs = 'thumb';
|
||||
$scope.count = 10;
|
||||
|
||||
$scope.go = function(d) { $location.path('/dashboard/pods/' + d.id); };
|
||||
@@ -81,18 +79,19 @@ app.controller('ListPodsCtrl', [
|
||||
});
|
||||
}
|
||||
|
||||
Object.keys(pod.labels)
|
||||
.forEach(function(key) {
|
||||
if (key == 'name') {
|
||||
_labels += ', ' + pod.labels[key];
|
||||
}
|
||||
if (key == 'uses') {
|
||||
_uses += ', ' + pod.labels[key];
|
||||
}
|
||||
});
|
||||
if (pod.labels) {
|
||||
Object.keys(pod.labels)
|
||||
.forEach(function(key) {
|
||||
if (key == 'name') {
|
||||
_labels += ', ' + pod.labels[key];
|
||||
}
|
||||
if (key == 'uses') {
|
||||
_uses += ', ' + pod.labels[key];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.content.push({
|
||||
thumb: '"assets/img/kubernetes.svg"',
|
||||
pod: pod.id,
|
||||
ip: pod.currentState.podIP,
|
||||
containers: _fixComma(_containers),
|
||||
|
Reference in New Issue
Block a user