Merge branch 'master' into fix-model-markdown

2017-06-16 13:52:32 -07:00
parent ce16666b57 1cab4984e0
commit 99600df0f1
11 changed files with 69 additions and 36 deletions
--- a/src/core/components/model.jsx
+++ b/src/core/components/model.jsx
@@ -246,7 +246,7 @@ class Model extends Component {
    switch(type) {
      case "object":
        return <ObjectModel className="object" { ...this.props } schema={ modelSchema }
-                                              name={ modelName || name }
+                                              name={ name || modelName }
                                              isRef={ isRef!== undefined ? isRef : !!$$ref }/>
      case "array":
        return <ArrayModel className="array" { ...this.props } schema={ modelSchema } required={ required } />