From 25ca49868d232e905bdd7b1399a3417d109cc440 Mon Sep 17 00:00:00 2001 From: pgregorynz Date: Tue, 9 Mar 2010 21:17:16 +0000 Subject: [PATCH] WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE DOWNLOADS TAB fixes validation on member creation when no membertypes available. [TFS Changeset #64608] --- umbraco/presentation/umbraco.presentation.csproj | 1 + umbraco/presentation/umbraco/create/member.ascx | 3 ++- umbraco/presentation/umbraco/create/member.ascx.cs | 1 + .../umbraco/create/member.ascx.designer.cs | 11 ++++++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index d5d7a07f7e..bf7c438c45 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -2804,6 +2804,7 @@ + diff --git a/umbraco/presentation/umbraco/create/member.ascx b/umbraco/presentation/umbraco/create/member.ascx index da3edd2018..a122201094 100644 --- a/umbraco/presentation/umbraco/create/member.ascx +++ b/umbraco/presentation/umbraco/create/member.ascx @@ -7,7 +7,8 @@ <%=umbraco.ui.Text("choose")%> - <%=umbraco.ui.Text("membertype")%>:
+ <%=umbraco.ui.Text("membertype")%>:*
diff --git a/umbraco/presentation/umbraco/create/member.ascx.cs b/umbraco/presentation/umbraco/create/member.ascx.cs index ae3040180c..c0f1d139b0 100644 --- a/umbraco/presentation/umbraco/create/member.ascx.cs +++ b/umbraco/presentation/umbraco/create/member.ascx.cs @@ -48,6 +48,7 @@ namespace umbraco.cms.presentation.create.controls passwordRequired.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", ui.Text("password"), BasePages.UmbracoEnsuredPage.CurrentUser); nameRequired.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", nameLiteral.Text, BasePages.UmbracoEnsuredPage.CurrentUser); emailRequired.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", "E-mail", BasePages.UmbracoEnsuredPage.CurrentUser); + memberTypeRequired.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", "Member Type", BasePages.UmbracoEnsuredPage.CurrentUser); Password.Text = Membership.GeneratePassword(Membership.MinRequiredPasswordLength, Membership.MinRequiredNonAlphanumericCharacters); diff --git a/umbraco/presentation/umbraco/create/member.ascx.designer.cs b/umbraco/presentation/umbraco/create/member.ascx.designer.cs index 8850182edd..479c5d09be 100644 --- a/umbraco/presentation/umbraco/create/member.ascx.designer.cs +++ b/umbraco/presentation/umbraco/create/member.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -58,6 +58,15 @@ namespace umbraco.cms.presentation.create.controls { /// protected global::System.Web.UI.WebControls.Panel memberChooser; + /// + /// memberTypeRequired control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator memberTypeRequired; + /// /// nodeType control. ///