Skip to content

Commit 8618658

Browse files
authored
[html2] Fix blank responses in html document (#18356)
* [html2]remove unnecessary mustache section * [html2]add null check
1 parent 0b3e6ed commit 8618658

1 file changed

Lines changed: 41 additions & 40 deletions

File tree

modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -445,48 +445,49 @@
445445

446446

447447
<div class="tab-content" id="responses-{{baseName}}-{{nickname}}-{{code}}-wrapper" style='margin-bottom: 10px;'>
448-
{{#schema}}
449-
<div class="tab-pane active" id="responses-{{baseName}}-{{nickname}}-{{code}}-schema">
450-
<div id="responses-{{baseName}}-{{nickname}}-schema-{{code}}" class="exampleStyle">
451-
<script>
452-
$(document).ready(function() {
453-
var schemaWrapper = {{{jsonSchema}}};
454-
var schema = findNode('schema',schemaWrapper).schema;
455-
if (!schema) {
456-
schema = schemaWrapper.schema;
457-
}
458-
if (schema.$ref != null) {
459-
schema = defsParser.$refs.get(schema.$ref);
460-
Object.keys(schema.properties).forEach( (item) => {
461-
if (schema.properties[item].$ref != null) {
462-
schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
463-
}
464-
});
465-
} else if (schema.items != null && schema.items.$ref != null) {
466-
schema.items = defsParser.$refs.get(schema.items.$ref);
467-
} else {
468-
schemaWrapper.definitions = Object.assign({}, defs);
469-
$RefParser.dereference(schemaWrapper).catch(function(err) {
470-
console.log(err);
471-
});
472-
}
448+
<div class="tab-pane active" id="responses-{{baseName}}-{{nickname}}-{{code}}-schema">
449+
<div id="responses-{{baseName}}-{{nickname}}-schema-{{code}}" class="exampleStyle">
450+
<script>
451+
$(document).ready(function() {
452+
var schemaWrapper = {{{jsonSchema}}};
453+
var schema = findNode('schema',schemaWrapper).schema;
454+
if (!schema) {
455+
schema = schemaWrapper.schema;
456+
}
457+
if (schema == null) {
458+
return;
459+
}
460+
if (schema.$ref != null) {
461+
schema = defsParser.$refs.get(schema.$ref);
462+
Object.keys(schema.properties).forEach( (item) => {
463+
if (schema.properties[item].$ref != null) {
464+
schema.properties[item] = defsParser.$refs.get(schema.properties[item].$ref);
465+
}
466+
});
467+
} else if (schema.items != null && schema.items.$ref != null) {
468+
schema.items = defsParser.$refs.get(schema.items.$ref);
469+
} else {
470+
schemaWrapper.definitions = Object.assign({}, defs);
471+
$RefParser.dereference(schemaWrapper).catch(function(err) {
472+
console.log(err);
473+
});
474+
}
473475
474-
var view = new JSONSchemaView(schema, 3);
475-
$('#responses-{{baseName}}-{{nickname}}-{{code}}-schema-data').val(JSON.stringify(schema));
476-
var result = $('#responses-{{baseName}}-{{nickname}}-schema-{{code}}');
477-
result.empty();
478-
result.append(view.render());
479-
});
480-
</script>
481-
</div>
482-
<input id='responses-{{baseName}}-{{nickname}}-{{code}}-schema-data' type='hidden' value=''></input>
476+
var view = new JSONSchemaView(schema, 3);
477+
$('#responses-{{baseName}}-{{nickname}}-{{code}}-schema-data').val(JSON.stringify(schema));
478+
var result = $('#responses-{{baseName}}-{{nickname}}-schema-{{code}}');
479+
result.empty();
480+
result.append(view.render());
481+
});
482+
</script>
483483
</div>
484-
{{#examples}}
485-
<div class="tab-pane" id="examples-{{baseName}}-{{nickname}}-{{code}}-example">
486-
<pre class="prettyprint"><code class="json">{{example}}</code></pre>
487-
</div>
488-
{{/examples}}
489-
{{/schema}}
484+
<input id='responses-{{baseName}}-{{nickname}}-{{code}}-schema-data' type='hidden' value=''></input>
485+
</div>
486+
{{#examples}}
487+
<div class="tab-pane" id="examples-{{baseName}}-{{nickname}}-{{code}}-example">
488+
<pre class="prettyprint"><code class="json">{{example}}</code></pre>
489+
</div>
490+
{{/examples}}
490491
{{#hasHeaders}}
491492
<div class="tab-pane" id="responses-{{nickname}}-{{code}}-headers">
492493
<table>

0 commit comments

Comments
 (0)