Skip to content

Commit

Permalink
Fix broken VCH create wizard on 6.5u1 (#114)
Browse files Browse the repository at this point in the history
* Use proper value for treeId for VcRoot

* Fix H5C modal height issue for 6.5u1
  • Loading branch information
jooskim authored Nov 27, 2017
1 parent c5f74c5 commit 07cb38a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export class CreateVchWizardComponent implements OnInit {
if (clrModalEl === null) {
return;
}
const pluginIframeEl = <HTMLElement>clrModalEl.querySelector('plugin-iframe');
const targetIframeEl = <HTMLElement>clrModalEl.querySelector('iframe');
const modalContentEl = <HTMLElement>clrModalEl.querySelector('.modal-content');
const modalHeaderEl = <HTMLElement>clrModalEl.querySelector('.modal-header');
Expand All @@ -86,6 +87,11 @@ export class CreateVchWizardComponent implements OnInit {
this.renderer.setElementStyle(modalBodyEl, 'max-height', '75vh');
this.renderer.setElementStyle(targetIframeEl, 'width', '100%');
this.renderer.setElementStyle(targetIframeEl, 'height', '100%');
// wrapper element that encapsulates iframe tag
// available from 6.5u1
if (pluginIframeEl !== null) {
this.renderer.setElementStyle(pluginIframeEl, 'height', '100%');
}
this.renderer.setElementStyle(
this.elRef.nativeElement.querySelector('clr-wizard'),
'height',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export class CreateVchWizardService {
} else {
const serverGuid = this.getServerGuid();
return this.http.get('/ui/tree/children?nodeTypeId=VcRoot' +
`&objRef=urn:vmomi:Folder:group-d1:${serverGuid}&treeId=VmFoldersTree`)
`&objRef=urn:vmomi:Folder:group-d1:${serverGuid}&treeId=vsphere.core.physicalInventorySpec`)
.catch(e => Observable.throw(e))
.map(response => response.json())
.catch(e => Observable.throw(e))
Expand Down

0 comments on commit 07cb38a

Please sign in to comment.