#363 Multiple inheritance types render incomplete in method response

Carolina Wright · Carolina Wright · commit caefc4247621 · 2017-03-28T09:49:59.000-03:00
diff --git a/dist/scripts/api-console-vendor.js b/dist/scripts/api-console-vendor.js
diff --git a/dist/scripts/api-console.js b/dist/scripts/api-console.js
@@ -2712,7 +2712,7 @@
           $rootScope.$broadcast(TOGGLE_POPOVER);
 
           $timeout(function () {
-            $scope.selectedType = RAML.Inspector.Types.mergeProperty({
+            $scope.selectedType = RAML.Inspector.Types.mergeType({
                 displayName: type,
                 type: [type]
               },
@@ -4504,7 +4504,10 @@ RAML.Inspector = (function() {
       if (superType) {
         var superTypeProperties = convertProperties(superType);
         properties = angular.extend({}, superTypeProperties, properties);
-        return getSuperTypesProperties(properties, superType.type[0], types);
+        superType.type.forEach(function (typeName) {
+          var typeProperties = getSuperTypesProperties(properties, typeName, types);
+          properties = angular.extend({}, typeProperties, properties);
+        });
       }
     }
     return properties;
diff --git a/src/app/directives/type.js b/src/app/directives/type.js
@@ -49,7 +49,7 @@
           $rootScope.$broadcast(TOGGLE_POPOVER);
 
           $timeout(function () {
-            $scope.selectedType = RAML.Inspector.Types.mergeProperty({
+            $scope.selectedType = RAML.Inspector.Types.mergeType({
                 displayName: type,
                 type: [type]
               },
diff --git a/src/common/inspector/types.js b/src/common/inspector/types.js
@@ -68,7 +68,10 @@
       if (superType) {
         var superTypeProperties = convertProperties(superType);
         properties = angular.extend({}, superTypeProperties, properties);
-        return getSuperTypesProperties(properties, superType.type[0], types);
+        superType.type.forEach(function (typeName) {
+          var typeProperties = getSuperTypesProperties(properties, typeName, types);
+          properties = angular.extend({}, typeProperties, properties);
+        });
       }
     }
     return properties;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,10 @@`
`68`	`68`	`if (superType) {`
`69`	`69`	`var superTypeProperties = convertProperties(superType);`
`70`	`70`	`properties = angular.extend({}, superTypeProperties, properties);`
`71`		`- return getSuperTypesProperties(properties, superType.type[0], types);`
	`71`	`+ superType.type.forEach(function (typeName) {`
	`72`	`+ var typeProperties = getSuperTypesProperties(properties, typeName, types);`
	`73`	`+ properties = angular.extend({}, typeProperties, properties);`
	`74`	`+ });`
`72`	`75`	`}`
`73`	`76`	`}`
`74`	`77`	`return properties;`