From ca3ddd7ec8c2d4c6d41b5b31382a55a124feb71d Mon Sep 17 00:00:00 2001 From: peppertree Date: Tue, 30 Sep 2014 00:22:40 +0200 Subject: [PATCH] Adding support for RedirectAfterLogin. See https://github.com/DNN-Connect/UserAccountRegistration/issues/7 --- App_LocalResources/Settings.ascx.resx | 6 ++++++ Settings.ascx | 6 ++++++ Settings.ascx.designer.vb | 18 ++++++++++++++++++ Settings.ascx.vb | 7 ++++++- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/App_LocalResources/Settings.ascx.resx b/App_LocalResources/Settings.ascx.resx index 71f1c4b..4522276 100644 --- a/App_LocalResources/Settings.ascx.resx +++ b/App_LocalResources/Settings.ascx.resx @@ -234,4 +234,10 @@ Validate e-mail through Regex: + + If the template also allows users to login using this module you may define a page that the user is being redirected to after logging in + + + Redirect after login: + \ No newline at end of file diff --git a/Settings.ascx b/Settings.ascx index e756145..fd32792 100644 --- a/Settings.ascx +++ b/Settings.ascx @@ -24,6 +24,12 @@ + +
+ + +
+
diff --git a/Settings.ascx.designer.vb b/Settings.ascx.designer.vb index 13522ef..f2e8521 100644 --- a/Settings.ascx.designer.vb +++ b/Settings.ascx.designer.vb @@ -50,6 +50,24 @@ Namespace Connect.Modules.UserManagement.AccountRegistration ''' Protected WithEvents drpDisplaynameMode As Global.System.Web.UI.WebControls.DropDownList + ''' + '''lblRedirectAfterLogin control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents lblRedirectAfterLogin As Global.DotNetNuke.UI.UserControls.LabelControl + + ''' + '''drpRedirectAfterLogin control. + ''' + ''' + '''Auto-generated field. + '''To modify move field declaration from designer file to code-behind file. + ''' + Protected WithEvents drpRedirectAfterLogin As Global.System.Web.UI.WebControls.DropDownList + ''' '''lblRedirectAfterSubmit control. ''' diff --git a/Settings.ascx.vb b/Settings.ascx.vb index 13cc588..90d5b6f 100644 --- a/Settings.ascx.vb +++ b/Settings.ascx.vb @@ -41,7 +41,8 @@ Namespace Connect.Modules.UserManagement.AccountRegistration If (settings.Contains("ExternalInterface")) Then txtInterface.Text = settings("ExternalInterface").ToString() If (settings.Contains("ShowUserName")) Then drpUsernameMode.SelectedValue = settings("ShowUserName").ToString() If (settings.Contains("ShowDisplayName")) Then drpDisplaynameMode.SelectedValue = settings("ShowDisplayName").ToString() - If (settings.Contains("RedirectAfterSubmit")) Then drpRedirectAfterSubmit.SelectedValue = settings("RedirectAfterSubmit").ToString() + If (Settings.Contains("RedirectAfterSubmit")) Then drpRedirectAfterSubmit.SelectedValue = Settings("RedirectAfterSubmit").ToString() + If (Settings.Contains("RedirectAfterLogin")) Then drpRedirectAfterLogin.SelectedValue = Settings("RedirectAfterLogin").ToString() If (settings.Contains("UsermanagementTab")) Then drpUserManagementTab.SelectedValue = settings("UsermanagementTab").ToString() If (settings.Contains("AddToRoleOnSubmit")) Then drpAddToRole.SelectedValue = settings("AddToRoleOnSubmit").ToString() If (settings.Contains("NotifyRole")) Then drpNotifyRole.Items.FindByText(settings("NotifyRole").ToString()).Selected = True @@ -74,6 +75,7 @@ Namespace Connect.Modules.UserManagement.AccountRegistration objModules.UpdateTabModuleSetting(TabModuleId, "ShowUserName", drpUsernameMode.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "ShowDisplayName", drpDisplaynameMode.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "RedirectAfterSubmit", drpRedirectAfterSubmit.SelectedValue) + objModules.UpdateTabModuleSetting(TabModuleId, "RedirectAfterLogin", drpRedirectAfterLogin.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "UsermanagementTab", drpUserManagementTab.SelectedValue) objModules.UpdateTabModuleSetting(TabModuleId, "AddToRoleOnSubmit", drpAddToRole.SelectedValue) 'we need the rolename for sending mails to users, therefor store here the rolename rather than the id! @@ -96,6 +98,9 @@ Namespace Connect.Modules.UserManagement.AccountRegistration drpRedirectAfterSubmit.DataSource = tabs drpRedirectAfterSubmit.DataBind() + drpRedirectAfterLogin.DataSource = tabs + drpRedirectAfterLogin.DataBind() + drpUserManagementTab.DataSource = tabs drpUserManagementTab.DataBind()