Merge branch 'release/v0.13.1'

ventrian · Apr 7, 2022 · f42009b · f42009b
2 parents 78df1f3 + 7d7290f
commit f42009b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 35 deletions.
diff --git a/Components/ArticleController.vb b/Components/ArticleController.vb
@@ -16,6 +16,7 @@ Imports DotNetNuke.Security.Roles
 Imports DotNetNuke.Services.Search
 Imports System.Xml
 Imports System.Security.Cryptography
+Imports DotNetNuke.Common.Internal
 Imports Ventrian.NewsArticles.Components.CustomFields
 Imports DotNetNuke.Services.Search.Entities
 Imports DotNetNuke.Entities.Portals
@@ -37,7 +38,7 @@ Namespace Ventrian.NewsArticles
                 Dim portalSettings As New PortalSettings(ModuleConfiguration.TabID, ModuleConfiguration.PortalID)
                 If (_articleSettings Is Nothing) Then
                     Try
-                        _articleSettings = New ArticleSettings(Common.GetModuleSettings(ModuleConfiguration.ModuleID), PortalSettings, ModuleConfiguration)
+                        _articleSettings = New ArticleSettings(Common.GetModuleSettings(ModuleConfiguration.ModuleID), portalSettings, ModuleConfiguration)
                     Catch
                         Dim objSettings As Hashtable = ModuleConfiguration.ModuleSettings
                         Dim objTabSettings As Hashtable = ModuleConfiguration.TabModuleSettings
@@ -48,7 +49,7 @@ Namespace Ventrian.NewsArticles
                             End If
                         Next
 
-                        _articleSettings = New ArticleSettings(objSettings, PortalSettings, ModuleConfiguration)
+                        _articleSettings = New ArticleSettings(objSettings, portalSettings, ModuleConfiguration)
                         ModuleController.Instance.UpdateModuleSetting(ModuleConfiguration.ModuleID, "ResetArticleSettings", "true")
                     End Try
                 End If
@@ -404,35 +405,20 @@ Namespace Ventrian.NewsArticles
                                 End If
                                 SearchItemCollection.Add(SearchItem)
 
-                                'Dim articleUrl As String
-                                'If objArticle.Url = "" Then
-                                '    Dim pageID As Integer = Null.NullInteger
-
-                                '    If (settings.Contains(ArticleConstants.ENABLE_CORE_SEARCH_SETTING)) Then
-                                '        doSearch = Convert.ToBoolean(settings(ArticleConstants.ENABLE_CORE_SEARCH_SETTING))
-                                '    End If
-                                '    If (Convert.ToBoolean(settings("AlwaysShowPageID"))) Then
-                                '        If (Pages(objArticle.ArticleID).Count > 0) Then
-                                '            pageID = CType(Pages(objArticle.ArticleID)(0), PageInfo).PageID
-                                '        End If
-                                '    End If
-
-                                '    articleUrl = Common.GetArticleLink(objArticle, Tab(modInfo), ArticleSettings(modInfo), IncludeCategory, pageID)
-                                'Else
-                                '    articleUrl = Globals.LinkClick(objArticle.Url, Tab(modInfo).TabID, objArticle.ModuleID, False)
-                                'End If
-                                Dim TabPath As String = modInfo.ParentTab.TabPath.Replace("//", "/")
+                                Dim ps As New PortalSettings(modInfo.PortalID)
+                                ps.PortalAlias = PortalAliasController.Instance.GetPortalAlias(ps.DefaultPortalAlias)
+                                Dim url As String = TestableGlobals.Instance.NavigateURL(modInfo.TabID, ps, "", SearchItem.GUID)
 
                                 Dim item2 As New SearchDocument With {
-                                .Url = TabPath + "?" + SearchItem.GUID,
+                                    .Url = url,
                                     .AuthorUserId = SearchItem.Author,
-            .UniqueKey = SearchItem.SearchKey,
-            .PortalId = modInfo.PortalID,
-            .Title = SearchItem.Title,
-            .Description = SearchItem.Description,
-            .Body = SearchItem.Content,
-            .ModifiedTimeUtc = SearchItem.PubDate
-        }
+                                    .UniqueKey = SearchItem.SearchKey,
+                                    .PortalId = modInfo.PortalID,
+                                    .Title = SearchItem.Title,
+                                    .Description = SearchItem.Description,
+                                    .Body = SearchItem.Content,
+                                    .ModifiedTimeUtc = SearchItem.PubDate
+                                }
                                 list.Add(item2)
                             Next
 

diff --git a/Installs/NewsArticles.00.13.00.zip b/Installs/NewsArticles.00.13.00.zip
diff --git a/Installs/NewsArticles.00.13.01.zip b/Installs/NewsArticles.00.13.01.zip
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.12.00.00")> 
-<Assembly: AssemblyFileVersion("1.12.00.00")> 
+<Assembly: AssemblyVersion("1.13.01.00")> 
+<Assembly: AssemblyFileVersion("1.13.01.00")> 
diff --git a/NewsArticles.dnn b/NewsArticles.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DnnForge - NewsArticles" type="Module" version="00.13.00">
+    <package name="DnnForge - NewsArticles" type="Module" version="00.13.01">
       <friendlyName>News Articles</friendlyName>
       <description>
         <![CDATA[
@@ -868,7 +868,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - LatestArticles" type="Module" version="00.13.00">
+    <package name="DnnForge - LatestArticles" type="Module" version="00.13.01">
       <friendlyName>News Articles Latest</friendlyName>
       <description>Allows you to display a list of the latest articles.</description>
       <iconFile />
@@ -929,7 +929,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - LatestComments" type="Module" version="00.13.00">
+    <package name="DnnForge - LatestComments" type="Module" version="00.13.01">
       <friendlyName>News Articles Comments</friendlyName>
       <description>Allows you to display a list of the latest comments.</description>
       <iconFile />
@@ -990,7 +990,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - NewsArchives" type="Module" version="00.13.00">
+    <package name="DnnForge - NewsArchives" type="Module" version="00.13.01">
       <friendlyName>News Articles Archives</friendlyName>
       <description>Allows you to display a list of articles by month.</description>
       <iconFile />
@@ -1051,7 +1051,7 @@
         </component>
       </components>
     </package>
-    <package name="DnnForge - NewsSearch" type="Module" version="00.13.00">
+    <package name="DnnForge - NewsSearch" type="Module" version="00.13.01">
       <friendlyName>News Articles Search</friendlyName>
       <description>Allows you to display a list of articles by month.</description>
       <iconFile />