projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.0'
[osm/UI.git]
/
skyquake
/
plugins
/
accounts
/
src
/
account
/
accountStore.js
diff --git
a/skyquake/plugins/accounts/src/account/accountStore.js
b/skyquake/plugins/accounts/src/account/accountStore.js
index
a9a6d1e
..
aeb5f48
100644
(file)
--- a/
skyquake/plugins/accounts/src/account/accountStore.js
+++ b/
skyquake/plugins/accounts/src/account/accountStore.js
@@
-125,6
+125,18
@@
let AccountMeta = {
label: 'Floating IP Pool',
ref: 'floating-ip-pool',
optional: true
label: 'Floating IP Pool',
ref: 'floating-ip-pool',
optional: true
+ }, {
+ label: "User Domain",
+ ref: 'user-domain',
+ optional: true
+ }, {
+ label: "Project Domain",
+ ref: 'project-domain',
+ optional: true
+ }, {
+ label: "Region",
+ ref: 'region',
+ optional: true
}],
"openvim": [{
label: "Host",
}],
"openvim": [{
label: "Host",
@@
-237,7
+249,7
@@
export default class AccountStore {
}
getResourceOrchestratorSuccess = (data) => {
this.alt.actions.global.hideScreenLoader.defer();
}
getResourceOrchestratorSuccess = (data) => {
this.alt.actions.global.hideScreenLoader.defer();
- if(data['
account-type'] == 'openmano'
) {
+ if(data['
rw-launchpad:resource-orchestrator'] && (data['rw-launchpad:resource-orchestrator']['account-type'] == 'openmano')
) {
this.setState({
showVIM: false
})
this.setState({
showVIM: false
})
@@
-352,7
+364,7
@@
export default class AccountStore {
}
generateOptionsByName(data) {
let results = [];
}
generateOptionsByName(data) {
let results = [];
- if (data.constructor.name == "Array") {
+ if (data
&& data
.constructor.name == "Array") {
data.map(function(d) {
results.push({
label: d.name,
data.map(function(d) {
results.push({
label: d.name,