Merge pull request #51 from serge-van-der-ven/bug/IS-0049

Fixed #49 (support for child portals)
DNN-Connect · Jul 28, 2019 · 7dcb5da · 7dcb5da
2 parents 5fa22d7 + 4daae44
commit 7dcb5da
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/Components/ModuleInstanceBase.cs b/Components/ModuleInstanceBase.cs
@@ -47,6 +47,14 @@ public class ModuleInstanceBase
         /// </value>
         public int ModuleID { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the portal identifier.
+        /// </summary>
+        /// <value>
+        ///     The portal identifier.
+        /// </value>
+        public int PortalId { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [switch user in one click].
         /// </summary>

diff --git a/TypeScript/app/identitySwitcher.d.ts b/TypeScript/app/identitySwitcher.d.ts
@@ -28,6 +28,7 @@
         ApplicationPath: string;
         ServicesFramework: any;
         ModuleID: number;
+        PortalId: number;
         FilterText: string;
         SwitchToText: string;
         SwitchUserInOneClick: boolean;

diff --git a/TypeScript/app/identitySwitcher/identityswitcher.factory.ts b/TypeScript/app/identitySwitcher/identityswitcher.factory.ts
@@ -12,6 +12,7 @@
             return this.$http.get<string[]>(apiUrl,
                 {
                     headers: {
+                        "PortalId": moduleInstance.PortalId,
                         "ModuleId": moduleInstance.ModuleID,
                         "TabId": moduleInstance.ServicesFramework.getTabId()
                     }
@@ -29,6 +30,7 @@
             return this.$http.get<IUserCollection>(apiUrl,
                 {
                     headers: {
+                        "PortalId": moduleInstance.PortalId,
                         "ModuleId": moduleInstance.ModuleID,
                         "TabId": moduleInstance.ServicesFramework.getTabId()
                     }
@@ -45,6 +47,7 @@
             return this.$http.post<void>(apiUrl, null,
                 {
                     headers: {
+                        "PortalId": moduleInstance.PortalId,
                         "ModuleId": moduleInstance.ModuleID,
                         "TabId": moduleInstance.ServicesFramework.getTabId()
                     }

diff --git a/ViewIdentitySwitcher.ascx.cs b/ViewIdentitySwitcher.ascx.cs
@@ -151,6 +151,7 @@ private TModuleInstance GetModuleInstance<TModuleInstance>(PortalModuleBase modu
             if (moduleControl != null)
             {
                 result.ModuleID = moduleControl.ModuleId;
+                result.PortalId = moduleControl.PortalId;
                 result.FilterText = Localization.GetString("FilterText.Text", this.LocalResourceFile);
                 result.SwitchToText = Localization.GetString("SwitchToText.Text", this.LocalResourceFile);