Skip to content

Hide storage classes select when there are none #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2017
Merged

Hide storage classes select when there are none #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/scripts/directives/oscPersistentVolumeClaim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ angular.module("openshiftConsole")

DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClassData) {
var storageClasses = storageClassData.by('metadata.name');
if (_.isEmpty(storageClasses)) {
return;
}

scope.storageClasses = _.sortBy(storageClasses, 'metadata.name');
var annotation = $filter('annotation');
scope.defaultStorageClass = _.find(scope.storageClasses, function(storageClass) {
Expand Down
3 changes: 1 addition & 2 deletions app/views/directives/osc-persistent-volume-claim.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<ng-form name="persistentVolumeClaimForm">
<fieldset ng-disabled="claimDisabled">
<div ng-show="storageClasses | hashSize" class="form-group">
<div ng-if="storageClasses.length" class="form-group">
<!--storage class-->
<label>Storage Class</label>
<div>
<ui-select
ng-if="storageClasses"
ng-model="claim.storageClass"
theme="bootstrap"
search-enabled="true"
Expand Down
2 changes: 2 additions & 0 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10262,6 +10262,7 @@ group:"storage.k8s.io",
resource:"storageclasses"
}, {}, function(b) {
var c = b.by("metadata.name");
if (!_.isEmpty(c)) {
e.storageClasses = _.sortBy(c, "metadata.name");
var d = a("annotation");
if (e.defaultStorageClass = _.find(e.storageClasses, function(a) {
Expand All @@ -10278,6 +10279,7 @@ description:"No storage class will be assigned"
};
e.storageClasses.unshift(f);
}
}
}, {
errorNotification:!1
}), b.list("limitranges", {
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7791,11 +7791,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
$templateCache.put('views/directives/osc-persistent-volume-claim.html',
"<ng-form name=\"persistentVolumeClaimForm\">\n" +
"<fieldset ng-disabled=\"claimDisabled\">\n" +
"<div ng-show=\"storageClasses | hashSize\" class=\"form-group\">\n" +
"<div ng-if=\"storageClasses.length\" class=\"form-group\">\n" +
"\n" +
"<label>Storage Class</label>\n" +
"<div>\n" +
"<ui-select ng-if=\"storageClasses\" ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
"<ui-select ng-model=\"claim.storageClass\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a storage class\" class=\"select-role\">\n" +
"<ui-select-match placeholder=\"Select a storage class\">\n" +
"<span>\n" +
"{{$select.selected.metadata.name}}\n" +
Expand Down