Merge branch 'feature/enable-folders-containing-templates' into versi…

…on/1.3
zkniebel · Apr 10, 2019 · f3e8cf4 · f3e8cf4
2 parents 880260c + 4f8f31c
commit f3e8cf4
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 4 deletions.
diff --git a/Installation-1.3.7.zip → Installation.zip b/Installation-1.3.7.zip → Installation.zip
diff --git a/Installation/Sitecore_Package/SitecoreUML Service for Sitecore-1.3.8-SitecorePackage.zip b/Installation/Sitecore_Package/SitecoreUML Service for Sitecore-1.3.8-SitecorePackage.zip
diff --git a/Installation/Sitecore_Package/SitecoreUML-Service-1.3.7-SitecorePackage.zip b/Installation/Sitecore_Package/SitecoreUML-Service-1.3.7-SitecorePackage.zip
diff --git a/Sitecore_Module/SitecoreUML.sln b/Sitecore_Module/SitecoreUML.sln
@@ -11,9 +11,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Feature", "2. Feature", "{C1A0A8DA-9DD7-4397-854F-EDC72371916C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3. Foundation", "3. Foundation", "{CD48DDAE-E2D5-4B92-ACA1-0E5E48A8FBA4}"
-	ProjectSection(SolutionItems) = preProject
-		src\Feature\SitecoreUML\code\ViewModels\JsonResult.cs = src\Feature\SitecoreUML\code\ViewModels\JsonResult.cs
-	EndProjectSection
 EndProject
 Project("{CAA73BB0-EF22-4D79-A57E-DF67B3BA9C80}") = "TDS.SitecoreUML.Core", "src\Feature\SitecoreUML\serialization\TDS.SitecoreUML.Core\TDS.SitecoreUML.Core.scproj", "{798A567B-EF3E-4146-9FE9-FF994421542D}"
 EndProject

diff --git a/Sitecore_Module/src/Feature/SitecoreUML/code/SitecoreDataManager.cs b/Sitecore_Module/src/Feature/SitecoreUML/code/SitecoreDataManager.cs
@@ -396,7 +396,7 @@ protected IJsonSitecoreItem GetJsonSitecoreItem(Item item, Item templateRoot, IL
                 };
             }
 
-            if (item.TemplateID == TemplateIDs.TemplateFolder)
+            if (item.TemplateID == TemplateIDs.TemplateFolder || item.TemplateID == TemplateIDs.Folder)
             {
                 return new JsonSitecoreTemplateFolder()
                 {