Merge branch 'master' into master

shockey · web-flow · commit bc676601a8f0 · 2017-10-20T16:59:19.000-07:00
diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx
@@ -115,7 +115,7 @@ export default class ParameterRow extends Component {
                               required={ required }
                               description={param.get("description") ? `${param.get("name")} - ${param.get("description")}` : `${param.get("name")}`}
                               onChange={ this.onChangeWrapper }
-                              schema={ param }/>
+                              schema={ isOAS3 && isOAS3() ? param.get("schema") : param }/>
           }
 
 

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ export default class ParameterRow extends Component {`
`115`	`115`	`required={ required }`
`116`	`116`	description={param.get("description") ? `${param.get("name")} - ${param.get("description")}` : `${param.get("name")}`}
`117`	`117`	`onChange={ this.onChangeWrapper }`
`118`		`- schema={ param }/>`
	`118`	`+ schema={ isOAS3 && isOAS3() ? param.get("schema") : param }/>`
`119`	`119`	`}`
`120`	`120`
`121`	`121`