Merge pull request #192 from donker/fixdg

Fix Posts Datagrid
DNNCommunity · May 13, 2022 · 88408f9 · 88408f9
2 parents 3b22899 + 1234ca5
commit 88408f9
Show file tree

Hide file tree

Showing 13 changed files with 688 additions and 447 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
 [Bb]in/
 [Oo]bj/
 
@@ -167,4 +166,4 @@ tools/
 **/obj/
 !Server/References/*.dll
 Releases/
-
+node_modules/
diff --git a/DotNetNuke.Modules.Blog.sln b/DotNetNuke.Modules.Blog.sln
@@ -1,12 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.902
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32328.378
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DotNetNuke.Modules.Blog", "Server\Blog\DotNetNuke.Modules.Blog.vbproj", "{4E2BCA3B-927C-4AF2-9999-B1C074FD0539}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OpenUrlRewriterDNNBlogProvider", "Server\OpenUrlRewriter\OpenUrlRewriterDNNBlogProvider.vbproj", "{1CE16AF6-17DE-440C-83F4-7B96431F52E7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "build\Build.csproj", "{22A9DE4E-9CFD-4ABA-8C82-87D1C22F2FD9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,8 @@ Global
 		{1CE16AF6-17DE-440C-83F4-7B96431F52E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CE16AF6-17DE-440C-83F4-7B96431F52E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CE16AF6-17DE-440C-83F4-7B96431F52E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22A9DE4E-9CFD-4ABA-8C82-87D1C22F2FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22A9DE4E-9CFD-4ABA-8C82-87D1C22F2FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Server/Blog/Manage.ascx b/Server/Blog/Manage.ascx
@@ -37,7 +37,7 @@
  <asp:Panel id="Posts" runat="server" CssClass="dnnClear">
   <div class="coreMessaging" id="blogPostsError"></div>
   <asp:GridView id="grdPosts" autogeneratecolumns="false" cssclass="dnnGrid dnnSecurityRolesGrid"
-   runat="server" allowpaging="True" allowcustompaging="True" enableviewstate="True" AllowSorting="true" OnSorting="GridView_Sorting">
+   runat="server" allowpaging="True" allowcustompaging="True" enableviewstate="True" AllowSorting="true">
     <Columns>
      <asp:TemplateField HeaderText="Actions">
       <ItemStyle Width="90px"></ItemStyle>
@@ -57,7 +57,7 @@
           style="display:<%# IIF(CType(Container.DataItem, DotNetNuke.Modules.Blog.Entities.Posts.PostInfo).Blog.CanApprove AND NOT CType(Container.DataItem, DotNetNuke.Modules.Blog.Entities.Posts.PostInfo).Published, "inline", "none") %>"><i class="fa fa-check icon16"></i></a>
       </ItemTemplate>
      </asp:TemplateField>
-     <asp:TemplateField headertext="Date">
+     <asp:TemplateField headertext="Date" SortExpression="PublishedOnDate">
       <ItemTemplate>
        <%# DotNetNuke.Modules.Blog.Common.Globals.UtcToLocalTime(Eval("PublishedOnDate"), UserController.GetCurrentUserInfo().Profile.PreferredTimeZone)%>
       </ItemTemplate>

diff --git a/Server/Blog/Manage.ascx.vb b/Server/Blog/Manage.ascx.vb
@@ -23,99 +23,108 @@ Imports System.Linq
 Imports DotNetNuke.Modules.Blog.Entities.Posts
 
 Public Class Manage
- Inherits BlogModuleBase
+  Inherits BlogModuleBase
 
- Private _totalPosts As Integer = -1
- Private Const ASCENDING As String = " ASC"
- Private Const DESCENDING As String = " DESC"
+  Private _totalPosts As Integer = -1
+  Private Const ASCENDING As String = " ASC"
+  Private Const DESCENDING As String = " DESC"
 
- Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Load
+  Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Load
 
-  If Not BlogContext.security.CanDoSomethingWithPosts Then
-   Throw New Exception("You do not have access to this resource. Please check your login status.")
-  End If
-  cmdAdd.Visible = BlogContext.Security.IsBlogger
-  blogsLink.Visible = BlogContext.Security.IsBlogger
-  Blogs.Visible = BlogContext.Security.IsBlogger
+    If Not BlogContext.Security.CanDoSomethingWithPosts Then
+      Throw New Exception("You do not have access to this resource. Please check your login status.")
+    End If
+    cmdAdd.Visible = BlogContext.Security.IsBlogger
+    blogsLink.Visible = BlogContext.Security.IsBlogger
+    Blogs.Visible = BlogContext.Security.IsBlogger
 
-  postsLink.Visible = BlogContext.Security.CanAddPost Or BlogContext.Security.CanEditPost
-  Posts.Visible = BlogContext.Security.CanAddPost Or BlogContext.Security.CanEditPost
+    postsLink.Visible = BlogContext.Security.CanAddPost Or BlogContext.Security.CanEditPost
+    Posts.Visible = BlogContext.Security.CanAddPost Or BlogContext.Security.CanEditPost
 
-  If Not IsPostBack Then
-   DataBind()
-  End If
+    If Not IsPostBack Then
+      DataBind()
+    End If
 
- End Sub
+  End Sub
 
- Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click
-  Response.Redirect(EditUrl("BlogEdit"), False)
- End Sub
+  Private Sub cmdAdd_Click(sender As Object, e As EventArgs) Handles cmdAdd.Click
+    Response.Redirect(EditUrl("BlogEdit"), False)
+  End Sub
 
- Private Sub cmdReturn_Click(sender As Object, e As EventArgs) Handles cmdReturn.Click
-  Response.Redirect(DotNetNuke.Common.NavigateURL(TabId), False)
- End Sub
+  Private Sub cmdReturn_Click(sender As Object, e As EventArgs) Handles cmdReturn.Click
+    Response.Redirect(DotNetNuke.Common.NavigateURL(TabId), False)
+  End Sub
 
- Public Overrides Sub DataBind()
+  Public Overrides Sub DataBind()
 
-  MyBase.DataBind()
+    MyBase.DataBind()
 
-  If BlogContext.security.IsEditor Then
-   dlBlogs.DataSource = BlogsController.GetBlogsByModule(Settings.ModuleId, UserId, BlogContext.Locale).Values
-  Else
-   dlBlogs.DataSource = BlogsController.GetBlogsByModule(Settings.ModuleId, UserId, BlogContext.Locale).Values.Where(Function(b)
-                                                                                                                      Return b.OwnerUserId = UserId
-                                                                                                                     End Function)
-  End If
-  dlBlogs.DataBind()
+    If BlogContext.Security.IsEditor Then
+      dlBlogs.DataSource = BlogsController.GetBlogsByModule(Settings.ModuleId, UserId, BlogContext.Locale).Values
+    Else
+      dlBlogs.DataSource = BlogsController.GetBlogsByModule(Settings.ModuleId, UserId, BlogContext.Locale).Values.Where(Function(b)
+                                                                                                                          Return b.OwnerUserId = UserId
+                                                                                                                        End Function)
+    End If
+    dlBlogs.DataBind()
 
-  If dlBlogs.Items.Count = 0 Then dlBlogs.Visible = False
+    If dlBlogs.Items.Count = 0 Then dlBlogs.Visible = False
 
-     GetPosts()
+    GetPosts()
 
- End Sub
+  End Sub
 
- Public Sub GetPosts()
-  grdPosts.DataSource = PostsController.GetPosts(Settings.ModuleId, -1, BlogContext.Locale, -1, "", Nothing, -1, True, grdPosts.PageIndex, grdPosts.PageSize, SortOrder, _totalPosts, UserId, BlogContext.Security.UserIsAdmin).Values
-  grdPosts.VirtualItemCount = _totalPosts
+  Public Sub GetPosts()
+    grdPosts.DataSource = PostsController.GetPosts(Settings.ModuleId, -1, BlogContext.Locale, -1, "", Nothing, -1, True, grdPosts.PageIndex, grdPosts.PageSize, SortOrder, _totalPosts, UserId, BlogContext.Security.UserIsAdmin).Values
+    grdPosts.VirtualItemCount = _totalPosts
     grdPosts.DataBind()
- End Sub
-
- Public Property GridViewSortDirection As SortDirection
-     Get
-         If ViewState("sortDirection") Is Nothing Then ViewState("sortDirection") = SortDirection.Descending
-         Return CType(ViewState("sortDirection"), SortDirection)
-     End Get
-     Set(ByVal value As SortDirection)
-         ViewState("sortDirection") = value
-     End Set
- End Property
-
- Public Property GridViewSortExpression As String
-     Get
-         If ViewState("sortExpression") Is Nothing Then ViewState("sortExpression") = "PUBLISHEDONDATE"
-         Return ViewState("sortExpression").ToString()
-     End Get
-     Set(ByVal value As String)
-         ViewState("sortExpression") = value
-     End Set
- End Property
-
- Private ReadOnly Property SortOrder As String
-    Get 
-        Return String.Concat(GridViewSortExpression, " ", GridViewSortDirection)
+  End Sub
+
+  Public Property GridViewSortDirection As SortDirection
+    Get
+      If ViewState("sortDirection") Is Nothing Then ViewState("sortDirection") = SortDirection.Descending
+      Return CType(ViewState("sortDirection"), SortDirection)
+    End Get
+    Set(ByVal value As SortDirection)
+      ViewState("sortDirection") = value
+    End Set
+  End Property
+
+  Public Property GridViewSortExpression As String
+    Get
+      If ViewState("sortExpression") Is Nothing Then ViewState("sortExpression") = "PUBLISHEDONDATE"
+      Return ViewState("sortExpression").ToString()
     End Get
- End Property
+    Set(ByVal value As String)
+      ViewState("sortExpression") = value
+    End Set
+  End Property
+
+  Private ReadOnly Property SortOrder As String
+    Get
+      If GridViewSortDirection = SortDirection.Ascending Then
+        Return String.Concat(GridViewSortExpression, " ASC")
+      Else
+        Return String.Concat(GridViewSortExpression, " DESC")
+      End If
+    End Get
+  End Property
+
+  Protected Sub GridView_Sorting(sender As Object, e As GridViewSortEventArgs) Handles grdPosts.Sorting
+    Dim sortExpression As String = e.SortExpression
 
- Protected Sub GridView_Sorting(ByVal sender As Object, ByVal e As GridViewSortEventArgs)
-     Dim sortExpression As String = e.SortExpression
+    If GridViewSortDirection = SortDirection.Ascending Then
+      GridViewSortDirection = SortDirection.Descending
+    Else
+      GridViewSortDirection = SortDirection.Ascending
+    End If
 
-     If GridViewSortDirection = SortDirection.Ascending Then
-         GridViewSortDirection = SortDirection.Descending
-     Else
-         GridViewSortDirection = SortDirection.Ascending
-     End If
+    GetPosts()
+  End Sub
 
-     GetPosts()
- End Sub
+  Protected Sub GridView_Paging(sender As Object, e As GridViewPageEventArgs) Handles grdPosts.PageIndexChanging
+    grdPosts.PageIndex = e.NewPageIndex
+    GetPosts()
+  End Sub
 
 End Class
diff --git a/Server/Blog/My Project/AssemblyInfo.vb b/Server/Blog/My Project/AssemblyInfo.vb
@@ -31,7 +31,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("The DotNetNuke Blog module is an easy to use content publishing module that is tightly integrated with the core DotNetNuke framework. It can be used in single or multi-author environments and also permits content authoring using off-site tools such as Windows Live Writer.")>
 <Assembly: AssemblyCompany("DNN Connect")>
 <Assembly: AssemblyProduct("http://www.dotnetnuke.com")>
-<Assembly: AssemblyCopyright("Copyright 2021 by DNN Connect")>
+<Assembly: AssemblyCopyright("Copyright 2022 by DNN Connect")>
 <Assembly: AssemblyTrademark("DotNetNuke")>
 
 ' Version information for an assembly consists of the following four values:
@@ -44,8 +44,8 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("6.5.2")>
+<Assembly: AssemblyVersion("6.5.3")>
 
 <Assembly: Guid("49cae2ac-30c7-45fe-8663-948e1543d8d3")>
 <Assembly: AssemblyInformationalVersion("06.04.01")>
-<Assembly: AssemblyFileVersion("6.5.2")>
+<Assembly: AssemblyFileVersion("6.5.3")>
diff --git a/Server/OpenUrlRewriter/My Project/AssemblyInfo.vb b/Server/OpenUrlRewriter/My Project/AssemblyInfo.vb
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("The DotNetNuke Blog module is an easy to use content publishing module that is tightly integrated with the core DotNetNuke framework. It can be used in single or multi-author environments and also permits content authoring using off-site tools such as Windows Live Writer.")>
 <Assembly: AssemblyCompany("DNN Connect")>
 <Assembly: AssemblyProduct("OpenUrlRewriterDNNBlogProvider")>
-<Assembly: AssemblyCopyright("Copyright 2021 by DNN Connect")>
+<Assembly: AssemblyCopyright("Copyright 2022 by DNN Connect")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("6.5.2")>
-<Assembly: AssemblyFileVersion("6.5.2")>
+<Assembly: AssemblyVersion("6.5.3")>
+<Assembly: AssemblyFileVersion("6.5.3")>
diff --git a/build.cake b/build.cake