mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
This commit is contained in:
commit
f926eee4eb
@ -2868,7 +2868,7 @@ public class ApiResponseHelper implements ResponseGenerator {
|
|||||||
response.setNspId(result.getNspId());
|
response.setNspId(result.getNspId());
|
||||||
response.setEnabled(result.isEnabled());
|
response.setEnabled(result.isEnabled());
|
||||||
|
|
||||||
response.setObjectName("VirtualRouterElement");
|
response.setObjectName("virtualrouterelement");
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -894,7 +894,7 @@
|
|||||||
var items = [];
|
var items = [];
|
||||||
items.push({id: 'Required', description: 'Required'});
|
items.push({id: 'Required', description: 'Required'});
|
||||||
items.push({id: 'Optional', description: 'Optional'});
|
items.push({id: 'Optional', description: 'Optional'});
|
||||||
items.push({id: 'Unavailable', description: 'Unavailable'});
|
//items.push({id: 'Unavailable', description: 'Unavailable'});
|
||||||
args.response.success({data: items});
|
args.response.success({data: items});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user