Merge branch 'main' into chore-add-detailed-errormsg

dotnet · Mar 2, 2024 · 834fcb1 · 834fcb1
2 parents 63e019f + baf0718
commit 834fcb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
         lfs: true
 
     - uses: ./.github/actions/build
@@ -66,7 +67,7 @@ jobs:
         path: /tmp/coredump*
 
   publish-docs:
-    if: github.ref == 'refs/heads/main'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [test]
     environment:
       name: github-pages

diff --git a/templates/default/ManagedReference.html.primary.js b/templates/default/ManagedReference.html.primary.js
@@ -23,7 +23,9 @@ exports.transform = function (model) {
     model.isClass = false;
     model.isEnum = true;
   }
-  model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  if(model._disableToc === undefined) {
+    model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  }
   model._disableNextArticle = true;
 
   if (extension && extension.postTransform) {

diff --git a/templates/default/RestApi.html.primary.js b/templates/default/RestApi.html.primary.js
@@ -12,7 +12,9 @@ exports.transform = function (model) {
   if (restApiCommon && restApiCommon.transform) {
     model = restApiCommon.transform(model);
   }
-  model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  if(model._disableToc === undefined) {
+    model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  }
   model._disableNextArticle = true;
 
   if (extension && extension.postTransform) {

diff --git a/templates/default/UniversalReference.html.primary.js b/templates/default/UniversalReference.html.primary.js
@@ -13,7 +13,9 @@ exports.transform = function (model) {
     model = urefCommon.transform(model);
   }
 
-  model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  if(model._disableToc === undefined) {
+    model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  }
   model._disableNextArticle = true;
 
   if (extension && extension.postTransform) {

diff --git a/templates/default/conceptual.html.primary.js b/templates/default/conceptual.html.primary.js
@@ -9,7 +9,9 @@ exports.transform = function (model) {
     model = extension.preTransform(model);
   }
 
-  model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  if(model._disableToc === undefined) {
+    model._disableToc = model._disableToc || !model._tocPath || (model._navPath === model._tocPath);
+  }
   model.docurl = model.docurl || common.getImproveTheDocHref(model, model._gitContribute, model._gitUrlPattern);
 
   if (extension && extension.postTransform) {