From c366d36df03d71a31876d7d272f194e85c5a47c8 Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <ebicoglu@users.noreply.github.com>
Date: Mon, 8 Oct 2018 13:43:30 +0300
Subject: [PATCH] closes #512

---
 .../Docs/Documents/ContentWithDetailsDto.cs   |  2 +-
 .../Volo/Docs/Localization/Domain/en.json     |  3 ++-
 .../Volo/Docs/Localization/Domain/es.json     |  3 ++-
 .../Volo/Docs/Localization/Domain/tr.json     |  3 ++-
 .../Pages/Documents/Project/Index.cshtml      | 23 +++++++++++++------
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/ContentWithDetailsDto.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/ContentWithDetailsDto.cs
index 7758251159..92ed6bc833 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/ContentWithDetailsDto.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/ContentWithDetailsDto.cs
@@ -84,7 +84,7 @@ namespace Volo.Docs.Documents
 
         public void ConvertItems()
         {
-            if (Content.IsNullOrEmpty())
+            if (!SuccessfullyRetrieved || Content.IsNullOrEmpty())
             {
                 RootNode = new NavigationNode();
                 return;
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
index 5540146823..1e29d1b7ab 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json
@@ -9,6 +9,7 @@
     "GoToTop": "Go to top",
     "Projects": "Project(s)",
     "NoProjectWarning": "There are no projects yet!",
-    "DocumentNotFound": "Oops, the requested document was not found!"
+    "DocumentNotFound": "Oops, the requested document was not found!",
+    "NavigationDocumentNotFound": "This version does not have a navigation document!"
   }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/es.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/es.json
index 5a2813c0e7..94a3eec1bd 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/es.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/es.json
@@ -9,6 +9,7 @@
     "GoToTop": "Subir",
     "Projects": "Proyecto(s)",
     "NoProjectWarning": "¡Aun no hay proyectos!",
-    "DocumentNotFound": "¡Oops, no se encontró el documento solicitado!"
+    "DocumentNotFound": "¡Oops, no se encontró el documento solicitado!",
+    "NavigationDocumentNotFound": "Esta versión no tiene un documento de navegación!"
   }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
index 1dd00600bc..5ad5617640 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json
@@ -9,6 +9,7 @@
     "GoToTop": "En üste çık",
     "Projects": "Proje(ler)",
     "NoProjectWarning": "Hiç proje yok!",
-    "DocumentNotFound": "Aradığınız döküman bulunamadı!"
+    "DocumentNotFound": "Aradığınız döküman bulunamadı!",
+    "NavigationDocumentNotFound": "Bu döküman için menü bulunamadı!"
   }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 365946dc01..2f16191dcf 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -96,13 +96,22 @@
                         </div>
                     }
 
-                    <ul root-node="@Model.Navigation.RootNode"
-                        version="@(Model.LatestVersionInfo.IsSelected ? DocsAppConsts.LatestVersion : Model.Version)"
-                        project-name="@Model.ProjectName"
-                        project-format="@Model.ProjectFormat"
-                        selected-document-name="@Model.DocumentNameWithExtension"
-                        id="sidebar-scroll"
-                        class="nav nav-list"></ul>
+                    @if (!Model.Navigation.SuccessfullyRetrieved || Model.Navigation.Content.IsNullOrEmpty())
+                    {
+                        <div class="text-muted p-3">
+                            <i class="fa fa-warning"></i> @L["NavigationDocumentNotFound"]
+                        </div>
+                    }
+                    else
+                    {
+                        <ul root-node="@Model.Navigation.RootNode"
+                            version="@(Model.LatestVersionInfo.IsSelected ? DocsAppConsts.LatestVersion : Model.Version)"
+                            project-name="@Model.ProjectName"
+                            project-format="@Model.ProjectFormat"
+                            selected-document-name="@Model.DocumentNameWithExtension"
+                            id="sidebar-scroll"
+                            class="nav nav-list"></ul>
+                    }
                 </div>
 
             </div>