tabname in context

sachatrauwaen · May 15, 2023 · 8881b2d · 8881b2d
1 parent d3be3e3
commit 8881b2d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/OpenContent/Components/DnnEntitiesAPIController.cs b/OpenContent/Components/DnnEntitiesAPIController.cs
@@ -514,7 +514,9 @@ public HttpResponseMessage UserRoleLookup(string q)
             {
                 var roles = DotNetNuke.Security.Roles.RoleController.Instance.GetRoles(PortalSettings.PortalId).AsQueryable();
 
-                roles = roles.Where(r => r.RoleName != "Administrators" && r.RoleName != "Registered Users");
+                roles = roles.Where(r => r.RoleName != "Administrators" 
+                                    && r.RoleName != "Registered Users" 
+                                    && r.RoleName != "Unverified Users");
                 if (q != "*" && !string.IsNullOrEmpty(q))
                 {
                     roles = roles.Where(t => t.RoleName.ToLower().Contains(q.ToLower()));

diff --git a/OpenContent/Components/Manifest/OpenContentModuleConfig.cs b/OpenContent/Components/Manifest/OpenContentModuleConfig.cs
@@ -123,6 +123,8 @@ internal string EditUrl(int moduleId)
         public bool PreviewEnabled => _portalSettings != null && (_portalSettings.UserMode == PortalSettings.Mode.View);
 
         public string PortalName => _portalSettings.PortalName;
+
+        public string TabName => _portalSettings.ActiveTab.TabName;
         #endregion
     }
 

diff --git a/OpenContent/Components/Render/ModelFactoryBase.cs b/OpenContent/Components/Render/ModelFactoryBase.cs
@@ -296,6 +296,7 @@ protected void ExtendModel(JObject model, bool onlyData, bool onlyMainData, stri
                 context["ModuleId"] = _module.ViewModule.ModuleId;
                 context["GoogleApiKey"] = App.Services.CreateGlobalSettingsRepository(_portalId).GetGoogleApiKey();
                 context["ModuleTitle"] = _module.ViewModule.ModuleTitle;
+                context["TabName"] = _module.TabName;
 
                 context["IsEditMode"] = IsEditMode;
                 context["PortalId"] = _portalId;

diff --git a/OpenContent/OpenContent.dnn b/OpenContent/OpenContent.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="OpenContent" type="Module" version="05.00.05">
+    <package name="OpenContent" type="Module" version="05.00.06">
       <friendlyName>OpenContent</friendlyName>
       <description>OpenContent module by Satrabel.be</description>
       <iconFile>~/DesktopModules/OpenContent/Images/icon_extensions.png</iconFile>