rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ingress model missing canHaveLabels property 

rancher/rancher#15096
rancher/rancher#16112
This commit is contained in:
Westly Wright 2018-10-15 12:26:11 -07:00
parent e6499a5b67
commit ae709b3da9
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/form-labels-annotations/template.hbs
View File

@ -66,7 +66,7 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#unless editing}} {{#unless editing}}
<div class="pt-20"></div> <hr class="mt-20 mb-20"/>
{{/unless}} {{/unless}}
<div class="col {{if editing 'span-6' 'span-12'}}"> <div class="col {{if editing 'span-6' 'span-12'}}">
{{#if editing}} {{#if editing}}

1
app/models/ingress.js
View File

@ -10,6 +10,7 @@ export default Resource.extend({
type: 'ingress', type: 'ingress',
canClone: true, canClone: true,
canHaveLabels: true,
namespace: reference('namespaceId', 'namespace', 'clusterStore'), namespace: reference('namespaceId', 'namespace', 'clusterStore'),

2
lib/shared/addon/components/form-ssl-termination/template.hbs
View File

@ -24,10 +24,12 @@
{{else}} {{else}}
<div class="text-center"> <div class="text-center">
<div class="text-muted mb-20">{{t 'formSslTermination.noCertificatesConfiged'}}</div> <div class="text-muted mb-20">{{t 'formSslTermination.noCertificatesConfiged'}}</div>
{{#if editing}}
<button class="btn bg-link icon-btn inline-block " {{action "addCert"}}> <button class="btn bg-link icon-btn inline-block " {{action "addCert"}}>
<span class="darken"><i class="icon icon-plus text-small"></i></span> <span class="darken"><i class="icon icon-plus text-small"></i></span>
<span>{{t 'formSslTermination.addCertLabel'}}</span> <span>{{t 'formSslTermination.addCertLabel'}}</span>
</button> </button>
{{/if}}
</div> </div>
{{/each}} {{/each}}
{{#if (and editing allCertificates.length)}} {{#if (and editing allCertificates.length)}}