Merge branch 'davidteixeira-master'

This commit is contained in:
wing328
2017-01-25 16:24:13 +08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -39,7 +39,7 @@
exports.constructFromObject = function(data, obj) {
if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
obj = obj || new exports();
{{#parent}}{{^parentModel}} ApiClient.constructFromObject(data, obj, {{vendorExtensions.x-itemType}});
{{#parent}}{{^parentModel}} ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-itemType}}');
{{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}} {{classname}}.constructFromObject(data, obj);{{/parentModel}}
{{#interfaces}} {{.}}.constructFromObject(data, obj);
{{/interfaces}}{{/useInheritance}}{{#vars}} if (data.hasOwnProperty('{{baseName}}')) {

View File

@@ -61,7 +61,7 @@
exports.constructFromObject = function(data, obj) {
if (data) {
obj = obj || new exports();
ApiClient.constructFromObject(data, obj, Animal);
ApiClient.constructFromObject(data, obj, 'Animal');
}
return obj;

View File

@@ -61,7 +61,7 @@
exports.constructFromObject = function(data, obj) {
if (data) {
obj = obj || new exports();
ApiClient.constructFromObject(data, obj, Animal);
ApiClient.constructFromObject(data, obj, 'Animal');
}
return obj;