Made permalinks consistent. Fixes #197 & fixes #196

PiranhaCMS · Mar 1, 2018 · fd00f6d · fd00f6d
1 parent a548165
commit fd00f6d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 6 deletions.
diff --git a/core/Piranha/App.cs b/core/Piranha/App.cs
@@ -207,7 +207,7 @@ private void Initialize(IApi api) {
                                 .ForMember(f => f.Items, o => o.Ignore());
                             cfg.CreateMap<Data.Page, Models.PageBase>()
                                 .ForMember(p => p.TypeId, o => o.MapFrom(m => m.PageTypeId))
-                                .ForMember(p => p.Permalink, o => o.MapFrom(m => m.Slug));
+                                .ForMember(p => p.Permalink, o => o.MapFrom(m => "/" + m.Slug));
                             cfg.CreateMap<Models.PageBase, Data.Page>()
                                 .ForMember(p => p.PageTypeId, o => o.MapFrom(m => m.TypeId))
                                 .ForMember(p => p.Fields, o => o.Ignore())
@@ -226,7 +226,7 @@ private void Initialize(IApi api) {
                                 .ForMember(p => p.Created, o => o.Ignore());
                             cfg.CreateMap<Data.Post, Models.PostBase>()
                                 .ForMember(p => p.TypeId, o => o.MapFrom(m => m.PostTypeId))
-                                .ForMember(p => p.Permalink, o => o.MapFrom(m => m.Blog.Slug + "/" + m.Slug));
+                                .ForMember(p => p.Permalink, o => o.MapFrom(m => "/" + m.Blog.Slug + "/" + m.Slug));
                             cfg.CreateMap<Models.PostBase, Data.Post>()
                                 .ForMember(p => p.PostTypeId, o => o.MapFrom(m => m.TypeId))
                                 .ForMember(p => p.CategoryId, o => o.MapFrom(m => m.Category.Id))

diff --git a/examples/CoreWeb/Views/Cms/Archive.cshtml b/examples/CoreWeb/Views/Cms/Archive.cshtml
@@ -18,7 +18,7 @@
     @foreach (var post in Model.Archive.Posts) {
         <article>
             <header>
-                <h2><a href="~/@post.Permalink">@post.Title</a></h2>
+                <h2><a href="@post.Permalink">@post.Title</a></h2>
             </header>
             <p class="small">Published: @post.Published.Value.ToString("yyyy-MM-dd") in @post.Category.Title</p>
             <p>

diff --git a/test/Piranha.Tests/Repositories/Pages.cs b/test/Piranha.Tests/Repositories/Pages.cs
@@ -246,6 +246,17 @@ public void GetDynamicBySlug() {
             }
         }
 
+        [Fact]
+        public void CheckPermlinkSyntax() {
+            using (var api = new Api(GetDb(), storage, cache)) {
+                var model = api.Pages.GetById(PAGE_1_ID);
+
+                Assert.NotNull(model);
+                Assert.NotNull(model.Permalink);
+                Assert.StartsWith("/", model.Permalink);
+            }
+        }
+
         [Fact]
         public void GetCollectionPage() {
             using (var api = new Api(GetDb(), storage, cache)) {

diff --git a/test/Piranha.Tests/Repositories/Posts.cs b/test/Piranha.Tests/Repositories/Posts.cs
@@ -289,7 +289,7 @@ public void GetGenericById() {
 
                 Assert.NotNull(model);
                 Assert.Equal("my-first-post", model.Slug);
-                Assert.Equal("blog/my-first-post", model.Permalink);
+                Assert.Equal("/blog/my-first-post", model.Permalink);
                 Assert.Equal("My first body", model.Body.Value);
             }
         }
@@ -301,7 +301,7 @@ public void GetGenericBySlug() {
 
                 Assert.NotNull(model);
                 Assert.Equal("my-first-post", model.Slug);
-                Assert.Equal("blog/my-first-post", model.Permalink);
+                Assert.Equal("/blog/my-first-post", model.Permalink);
                 Assert.Equal("My first body", model.Body.Value);
             }
         }
@@ -313,7 +313,7 @@ public void GetDynamicById() {
 
                 Assert.NotNull(model);
                 Assert.Equal("my-first-post", model.Slug);
-                Assert.Equal("blog/my-first-post", model.Permalink);
+                Assert.Equal("/blog/my-first-post", model.Permalink);
                 Assert.Equal("My first body", model.Regions.Body.Value);
             }
         }
@@ -329,6 +329,17 @@ public void GetDynamicBySlug() {
             }
         }
 
+        [Fact]
+        public void CheckPermlinkSyntax() {
+            using (var api = new Api(GetDb(), storage, cache)) {
+                var model = api.Posts.GetById(POST_1_ID);
+
+                Assert.NotNull(model);
+                Assert.NotNull(model.Permalink);
+                Assert.StartsWith("/", model.Permalink);
+            }
+        }
+
         [Fact]
         public void GetCollectionPost() {
             using (var api = new Api(GetDb(), storage, cache)) {

diff --git a/test/Piranha.Tests/Repositories/Sites.cs b/test/Piranha.Tests/Repositories/Sites.cs
@@ -254,6 +254,18 @@ public void GetSitemapById() {
             }
         }
 
+        [Fact]
+        public void CheckPermlinkSyntax() {
+            using (var api = new Api(GetDb(), storage, cache)) {
+                var sitemap = api.Sites.GetSitemap();
+
+                foreach (var item in sitemap) {
+                    Assert.NotNull(item.Permalink);
+                    Assert.StartsWith("/", item.Permalink);
+                }
+            }
+        }        
+
         [Fact]
         public void GetUnpublishedSitemap() {
             using (var api = new Api(GetDb(), storage, cache)) {