yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE DOWNLOADS TAB

Browse Source 
fixes validation on member creation when no membertypes available.

[TFS Changeset #64608]
This commit is contained in:
pgregorynz
2010-03-09 21:17:16 +00:00
parent b3799ab038
commit 25ca49868d
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -2804,6 +2804,7 @@
</WebReferenceUrl>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Code\" />
<Folder Include="App_Data\" />
<Folder Include="css\" />
<Folder Include="data\previews\" />

3
umbraco/presentation/umbraco/create/member.ascx
View File

@@ -7,7 +7,8 @@
<asp:TextBox ID="rename" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>
<asp:Panel ID="memberChooser" runat="server">
<%=umbraco.ui.Text("choose")%>
<%=umbraco.ui.Text("membertype")%>:<br />
<%=umbraco.ui.Text("membertype")%>:<asp:RequiredFieldValidator ID="memberTypeRequired" ErrorMessage="*" ControlToValidate="nodeType"
runat="server">*</asp:RequiredFieldValidator><br />
<asp:ListBox ID="nodeType" runat="server" Width="350px" CssClass="bigInput" Rows="1"
SelectionMode="Single"></asp:ListBox>
</asp:Panel>

1
umbraco/presentation/umbraco/create/member.ascx.cs
View File

@@ -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);

11
umbraco/presentation/umbraco/create/member.ascx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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 {
/// </remarks>
protected global::System.Web.UI.WebControls.Panel memberChooser;
/// <summary>
/// memberTypeRequired control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.RequiredFieldValidator memberTypeRequired;
/// <summary>
/// nodeType control.
/// </summary>