Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f68a07f
hidden: Pod, cluster, host for normal and domain admin user
Mar 31, 2020
50a8a07
merge branch 'master-upstream' into 'feature/fix-vm-wizard'
Apr 1, 2020
49eb970
add filter template/iso by featured, community, shared, self
Apr 1, 2020
c1ba9bc
change locale for translate
Apr 1, 2020
4a905dd
add button support for add network
Apr 1, 2020
bce9148
Fixes duplicate data of diskoffering, sshKeyPair
Apr 1, 2020
068ae54
add domain, account to get data list networks
Apr 6, 2020
3d4111a
view: fix deployvm user fields visibility
shwstppr Apr 6, 2020
3afdaef
revert previous commit
shwstppr Apr 6, 2020
1a33a51
view: vm deployment, changes for variable offerings
shwstppr Apr 8, 2020
68c21b9
added support for custom compute offering
shwstppr Apr 8, 2020
c0efb1e
fix selected template/iso
Apr 9, 2020
a208392
Merge branch 'fix-vm-deployment-254' into 'utchoang:feature/fix-vm-wi…
Apr 9, 2020
bc90500
fix userdata param
shwstppr Apr 9, 2020
f466373
fix zone selection
shwstppr Apr 9, 2020
088a3c3
fix merge conflit
Apr 9, 2020
d5dbfdc
Merge branch 'fix-vm-deployment-254' into 'utchoang:feature/fix-vm-wi…
Apr 9, 2020
b8f1253
views: iso hypervisor field
shwstppr Apr 9, 2020
f38f429
add support for type of compute offering
Apr 10, 2020
ba88c6a
Merge for add hypervisor field
Apr 10, 2020
35864ca
add support compute offering & auto fill value
Apr 13, 2020
0f8649b
Fix list group don't load
Apr 13, 2020
2d1b581
fix: auto fill value input and select option
Apr 14, 2020
2e5c866
Merge branch 'master-upstream' into feature/fix-vm-wizard
Apr 15, 2020
2055b04
Fixes issues for multi-zone setup
Apr 21, 2020
3325e31
Fix error when do not select affinity groups
Apr 21, 2020
d08fc96
Fix Quota Email template: Search is not working
Apr 21, 2020
b65455c
Revert "Fix error when do not select affinity groups"
Apr 21, 2020
39f65ca
Merge branch 'master' into feature/fix-vm-wizard
rohityadavcloud Apr 22, 2020
e80153c
Merge remote-tracking branch 'origin/master' into feature/fix-vm-wizard
rohityadavcloud Apr 22, 2020
d16485b
fixes
rohityadavcloud Apr 22, 2020
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: 2 additions & 2 deletions src/components/header/ProjectMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ export default {
if (json && json.listprojectsresponse && json.listprojectsresponse.project) {
this.projects.push(...json.listprojectsresponse.project)
}
const currentProject = Vue.ls.get(CURRENT_PROJECT)
const currentProject = Vue.ls.get(CURRENT_PROJECT) || {}
for (var project of this.projects) {
if (project.id === currentProject.id) {
if (project && currentProject && project.id === currentProject.id) {
this.setSelectedProject(project)
break
}
Expand Down
9 changes: 8 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,8 @@
"message.required.traffic.type": "Error in configuration! All required traffic types should be added and with multiple physical networks each network should have a label.",
"message.desc.primary.storage": "Each cluster must contain one or more primary storage servers, and we will add the first one now. Primary storage contains the disk volumes for all the VMs running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.",
"message.desc.secondary.storage": "Each zone must have at least one NFS or secondary storage server, and we will add the first one now. Secondary storage stores VM templates, ISO images, and VM disk volume snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.",
"message.error.required.input": "Please enter input",
"message.error.invalid.range": "Please enter values from {min} to {max}",
"label.name": "Name",
"label.ipv4.dns1": "IPv4 DNS1",
"label.ipv4.dns2": "IPv4 DNS2",
Expand Down Expand Up @@ -1266,5 +1268,10 @@
"label.launch.zone": "Launch Zone",
"label.done": "Done",
"label.fix.errors": "Fix errors",
"error.something.went.wrong.please.correct.the.following": "Something went wrong; please correct the following"
"error.something.went.wrong.please.correct.the.following": "Something went wrong; please correct the following",
"filter": "Filter",
"featured": "Featured",
"community": "Community",
"selfexecutable": "Self",
"sharedexecutable": "Shared"
}
2 changes: 2 additions & 0 deletions src/views/AutogenView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ export default {
if (this.searchQuery !== '') {
if (this.apiName === 'listRoles') {
params.name = this.searchQuery
} else if (this.apiName === 'quotaEmailTemplateList') {
params.templatetype = this.searchQuery
} else {
params.keyword = this.searchQuery
}
Expand Down
Loading