Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More StyleCop fixes #3843

Merged
merged 14 commits into from
Jun 17, 2020
Merged

More StyleCop fixes #3843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bfb3420
Fix CS1570 warning - invalid XML in doc comments
bdukes Jun 16, 2020
1640a19
Fix ModuleControlPipeline
bdukes Jun 16, 2020
811e983
Fix documented return for void method
bdukes Jun 16, 2020
d19fa21
Remove regions per StyleCop
bdukes Jun 16, 2020
879ecc0
Add period to end of documentation
bdukes Jun 16, 2020
e050d21
Fix file names not matching class names
bdukes Jun 16, 2020
ad16a07
Clean up LogFile
bdukes Jun 16, 2020
99c3e49
Improve documentation to comply with StyleCop
bdukes Jun 16, 2020
704c16f
SA1200 move using statements inside namespace
bdukes Jun 16, 2020
26d679c
Fix order of keywords
bdukes Jun 16, 2020
2cabb43
Fix indentation
bdukes Jun 16, 2020
1f173da
StyleCop newline fixes
bdukes Jun 16, 2020
44bdccf
Remove Stylecop from DotNetNuke.Log4Net
bdukes Jun 16, 2020
b5c702f
StyleCop ordering fixes
bdukes Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
160 changes: 80 additions & 80 deletions DNN Platform/Admin Modules/Dnn.Modules.Console/Settings.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,82 +25,6 @@ public partial class Settings : ModuleSettingsBase
{
private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(Settings));

private void BindTabs(int tabId, bool includeParent)
{
List<TabInfo> tempTabs = TabController.GetTabsBySortOrder(this.PortalId).OrderBy(t => t.Level).ThenBy(t => t.HasChildren).ToList();

IList<TabInfo> tabList = new List<TabInfo>();

IList<int> tabIdList = new List<int>();
tabIdList.Add(tabId);

if (includeParent)
{
TabInfo consoleTab = TabController.Instance.GetTab(tabId, this.PortalId);
if (consoleTab != null)
{
tabList.Add(consoleTab);
}
}

foreach (TabInfo tab in tempTabs)
{
bool canShowTab = TabPermissionController.CanViewPage(tab) &&
!tab.IsDeleted &&
(tab.StartDate < DateTime.Now || tab.StartDate == Null.NullDate);

if (!canShowTab)
{
continue;
}

if (tabIdList.Contains(tab.ParentId))
{
if (!tabIdList.Contains(tab.TabID))
{
tabIdList.Add(tab.TabID);
}

tabList.Add(tab);
}
}

this.tabs.DataSource = tabList;
this.tabs.DataBind();
}

private void SwitchMode()
{
int parentTabId = -1;
if (this.Settings.ContainsKey("ParentTabID") && !string.IsNullOrEmpty(Convert.ToString(this.Settings["ParentTabID"])))
{
parentTabId = Convert.ToInt32(this.Settings["ParentTabID"]);
}

switch (this.modeList.SelectedValue)
{
case "Normal":
this.parentTabRow.Visible = true;
this.includeParentRow.Visible = true;
this.tabVisibilityRow.Visible = false;
break;
case "Profile":
this.parentTabRow.Visible = false;
this.includeParentRow.Visible = false;
this.tabVisibilityRow.Visible = true;
parentTabId = this.PortalSettings.UserTabId;
break;
case "Group":
this.parentTabRow.Visible = true;
this.includeParentRow.Visible = true;
this.tabVisibilityRow.Visible = true;
break;
}

this.ParentTab.SelectedPage = TabController.Instance.GetTab(parentTabId, this.PortalId);
this.BindTabs(parentTabId, this.IncludeParent.Checked);
}

public override void LoadSettings()
{
try
Expand Down Expand Up @@ -232,6 +156,82 @@ public override void UpdateSettings()
}
}

private void BindTabs(int tabId, bool includeParent)
{
List<TabInfo> tempTabs = TabController.GetTabsBySortOrder(this.PortalId).OrderBy(t => t.Level).ThenBy(t => t.HasChildren).ToList();

IList<TabInfo> tabList = new List<TabInfo>();

IList<int> tabIdList = new List<int>();
tabIdList.Add(tabId);

if (includeParent)
{
TabInfo consoleTab = TabController.Instance.GetTab(tabId, this.PortalId);
if (consoleTab != null)
{
tabList.Add(consoleTab);
}
}

foreach (TabInfo tab in tempTabs)
{
bool canShowTab = TabPermissionController.CanViewPage(tab) &&
!tab.IsDeleted &&
(tab.StartDate < DateTime.Now || tab.StartDate == Null.NullDate);

if (!canShowTab)
{
continue;
}

if (tabIdList.Contains(tab.ParentId))
{
if (!tabIdList.Contains(tab.TabID))
{
tabIdList.Add(tab.TabID);
}

tabList.Add(tab);
}
}

this.tabs.DataSource = tabList;
this.tabs.DataBind();
}

private void SwitchMode()
{
int parentTabId = -1;
if (this.Settings.ContainsKey("ParentTabID") && !string.IsNullOrEmpty(Convert.ToString(this.Settings["ParentTabID"])))
{
parentTabId = Convert.ToInt32(this.Settings["ParentTabID"]);
}

switch (this.modeList.SelectedValue)
{
case "Normal":
this.parentTabRow.Visible = true;
this.includeParentRow.Visible = true;
this.tabVisibilityRow.Visible = false;
break;
case "Profile":
this.parentTabRow.Visible = false;
this.includeParentRow.Visible = false;
this.tabVisibilityRow.Visible = true;
parentTabId = this.PortalSettings.UserTabId;
break;
case "Group":
this.parentTabRow.Visible = true;
this.includeParentRow.Visible = true;
this.tabVisibilityRow.Visible = true;
break;
}

this.ParentTab.SelectedPage = TabController.Instance.GetTab(parentTabId, this.PortalId);
this.BindTabs(parentTabId, this.IncludeParent.Checked);
}

protected override void OnInit(EventArgs e)
{
base.OnInit(e);
Expand All @@ -242,14 +242,14 @@ protected override void OnInit(EventArgs e)
this.ParentTab.UndefinedItem = new ListItem(DynamicSharedConstants.Unspecified, string.Empty);
}

private void modeList_SelectedIndexChanged(object sender, EventArgs e)
protected void parentTab_SelectedIndexChanged(object sender, EventArgs e)
{
this.SwitchMode();
this.BindTabs(this.ParentTab.SelectedItemValueAsInt, this.IncludeParent.Checked);
}

protected void parentTab_SelectedIndexChanged(object sender, EventArgs e)
private void modeList_SelectedIndexChanged(object sender, EventArgs e)
{
this.BindTabs(this.ParentTab.SelectedItemValueAsInt, this.IncludeParent.Checked);
this.SwitchMode();
}

private void tabs_ItemDataBound(object Sender, RepeaterItemEventArgs e)
Expand Down
Loading