Skip to content

Commit 5cddea7

Browse files
Merge pull request #1308 from johnhenley/dev825/issues/init-screen-theme-1305
ENH: Simplified initial install screen
2 parents f9b9a58 + eb184c8 commit 5cddea7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Dnn.CommunityForums/Classic.ascx.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ protected override void OnLoad(EventArgs e)
5959
{
6060
base.OnLoad(e);
6161

62-
this.SocialGroupId = -1;
63-
if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
64-
{
65-
this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
66-
}
67-
this.SetupPage();
68-
6962
#if DEBUG
7063
//ForumsConfig.Install_Upgrade_CreateForumDefaultSettingsAndSecurity_080200();
7164
//new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().RemoveUnused(this.ForumModuleId);
@@ -84,6 +77,11 @@ protected override void OnLoad(EventArgs e)
8477
this.ForumModuleId = this.ModuleId;
8578
}
8679

80+
this.SocialGroupId = -1;
81+
if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
82+
{
83+
this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
84+
}
8785
string ctl = this.DefaultView;
8886
string opts = string.Empty;
8987

@@ -130,6 +128,7 @@ protected override void OnLoad(EventArgs e)
130128
}
131129

132130
this.currView = ctl;
131+
this.SetupPage();
133132
this.GetControl(ctl, opts);
134133

135134
if (this.Request.IsAuthenticated)
@@ -142,6 +141,7 @@ protected override void OnLoad(EventArgs e)
142141
}
143142
else
144143
{
144+
this.ShowToolbar = false;
145145
string ctlPath = Globals.ModulePath + "controls/_default.ascx";
146146
ForumBase ctlDefault = (ForumBase)this.LoadControl(ctlPath);
147147
ctlDefault.ID = "ctlConfig";

0 commit comments

Comments
 (0)