Skip to content

Commit 8881b2d

Browse files
author
Sacha Trauwaen
committed
tabname in context
1 parent d3be3e3 commit 8881b2d

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

OpenContent/Components/DnnEntitiesAPIController.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,9 @@ public HttpResponseMessage UserRoleLookup(string q)
514514
{
515515
var roles = DotNetNuke.Security.Roles.RoleController.Instance.GetRoles(PortalSettings.PortalId).AsQueryable();
516516

517-
roles = roles.Where(r => r.RoleName != "Administrators" && r.RoleName != "Registered Users");
517+
roles = roles.Where(r => r.RoleName != "Administrators"
518+
&& r.RoleName != "Registered Users"
519+
&& r.RoleName != "Unverified Users");
518520
if (q != "*" && !string.IsNullOrEmpty(q))
519521
{
520522
roles = roles.Where(t => t.RoleName.ToLower().Contains(q.ToLower()));

OpenContent/Components/Manifest/OpenContentModuleConfig.cs

+2
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ internal string EditUrl(int moduleId)
123123
public bool PreviewEnabled => _portalSettings != null && (_portalSettings.UserMode == PortalSettings.Mode.View);
124124

125125
public string PortalName => _portalSettings.PortalName;
126+
127+
public string TabName => _portalSettings.ActiveTab.TabName;
126128
#endregion
127129
}
128130

OpenContent/Components/Render/ModelFactoryBase.cs

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ protected void ExtendModel(JObject model, bool onlyData, bool onlyMainData, stri
296296
context["ModuleId"] = _module.ViewModule.ModuleId;
297297
context["GoogleApiKey"] = App.Services.CreateGlobalSettingsRepository(_portalId).GetGoogleApiKey();
298298
context["ModuleTitle"] = _module.ViewModule.ModuleTitle;
299+
context["TabName"] = _module.TabName;
299300

300301
context["IsEditMode"] = IsEditMode;
301302
context["PortalId"] = _portalId;

OpenContent/OpenContent.dnn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="OpenContent" type="Module" version="05.00.05">
3+
<package name="OpenContent" type="Module" version="05.00.06">
44
<friendlyName>OpenContent</friendlyName>
55
<description>OpenContent module by Satrabel.be</description>
66
<iconFile>~/DesktopModules/OpenContent/Images/icon_extensions.png</iconFile>

0 commit comments

Comments
 (0)