From 9b0ca064425619e6cfc1d5fb1b34ae97e601343c Mon Sep 17 00:00:00 2001
From: Aniokrait <43056135+Aniokrait@users.noreply.github.com>
Date: Sun, 19 May 2024 18:46:27 +0900
Subject: [PATCH] [html2] Change to correct variable (#18685)

---
 bin/configs/{unmaintained => }/html2.yaml                 | 0
 .../src/main/resources/htmlDocs2/index.mustache           | 2 +-
 samples/documentation/html2/index.html                    | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename bin/configs/{unmaintained => }/html2.yaml (100%)

diff --git a/bin/configs/unmaintained/html2.yaml b/bin/configs/html2.yaml
similarity index 100%
rename from bin/configs/unmaintained/html2.yaml
rename to bin/configs/html2.yaml
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
index 04dafb2803b..ec5d8c742f6 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
@@ -507,7 +507,7 @@
                                           </tr>
                                           {{#headers}}
                                               <tr>
-                                                  <td>{{name}}</td>
+                                                  <td>{{baseName}}</td>
                                                   <td>{{#datatype}}{{dataType}}{{/datatype}}</td>
                                                   <td>{{dataFormat}}</td>
                                                   <td>{{description}}</td>
diff --git a/samples/documentation/html2/index.html b/samples/documentation/html2/index.html
index a67f3492000..1f7b7b1cf7e 100644
--- a/samples/documentation/html2/index.html
+++ b/samples/documentation/html2/index.html
@@ -9591,19 +9591,19 @@ The password for login in clear text
                                               <th>Description</th>
                                           </tr>
                                               <tr>
-                                                  <td>SetDashCookie</td>
+                                                  <td>Set-Cookie</td>
                                                   <td>String</td>
                                                   <td></td>
                                                   <td>Cookie authentication key for use with the &#x60;api_key&#x60; apiKey authentication.</td>
                                               </tr>
                                               <tr>
-                                                  <td>XDashRateDashLimit</td>
+                                                  <td>X-Rate-Limit</td>
                                                   <td>Integer</td>
                                                   <td>int32</td>
                                                   <td>calls per hour allowed by the user</td>
                                               </tr>
                                               <tr>
-                                                  <td>XDashExpiresDashAfter</td>
+                                                  <td>X-Expires-After</td>
                                                   <td>Date</td>
                                                   <td>date-time</td>
                                                   <td>date in UTC when token expires</td>
@@ -11660,7 +11660,7 @@ var JSONSchemaView = (function () {
     // Determine if a schema is an array
     this.isArray = !this.isAny && this.schema && this.schema.type === 'array';
 
-    this.isObject = this.schema && (this.schema.type === 'object' || this.schema.properties || this.schema.anyOf || this.schema.oneof || this.schema.allOf);
+    this.isObject = this.schema && (this.schema.type === 'object' || this.schema.properties || this.schema.anyOf || this.schema.oneOf || this.schema.allOf);
 
     // Determine if a schema is a primitive
     this.isPrimitive = !this.isAny && !this.isArray && !this.isObject;