From e2bda227ba73a092b8a6a02b3abaf663a5bd7481 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 18 Dec 2016 19:29:44 +0100 Subject: [PATCH] Added some validation to Create Org --- .../Pages.Admin.designer.cs | 18 +++++++++++++ Site/App_GlobalResources/Pages.Admin.resx | 6 +++++ Site/Pages/v5/Admin/CreateOrganization.aspx | 8 +++++- .../Pages/v5/Admin/CreateOrganization.aspx.cs | 27 ++++++++++++++++--- 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/Site/App_GlobalResources/Pages.Admin.designer.cs b/Site/App_GlobalResources/Pages.Admin.designer.cs index 6d22a877..79414fab 100644 --- a/Site/App_GlobalResources/Pages.Admin.designer.cs +++ b/Site/App_GlobalResources/Pages.Admin.designer.cs @@ -168,6 +168,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Organization name cannot be empty. You need to give the new organization a name!. + /// + internal static string CreateOrganization_Error_OrganizationNameCannotBeEmpty { + get { + return ResourceManager.GetString("CreateOrganization_Error_OrganizationNameCannotBeEmpty", resourceCulture); + } + } + /// /// Looks up a localized string similar to You can create a new organization either as a new standalone organization, or as a child organization of the current one. (Everybody with responsibilities in a parent organization automatically has corresponding rights and privileges in all its children.). /// @@ -177,6 +186,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to New Organization Name. + /// + internal static string CreateOrganization_NewOrganizationName { + get { + return ResourceManager.GetString("CreateOrganization_NewOrganizationName", resourceCulture); + } + } + /// /// Looks up a localized string similar to Operating currency. /// diff --git a/Site/App_GlobalResources/Pages.Admin.resx b/Site/App_GlobalResources/Pages.Admin.resx index f2fbf7b5..31f6f822 100644 --- a/Site/App_GlobalResources/Pages.Admin.resx +++ b/Site/App_GlobalResources/Pages.Admin.resx @@ -158,9 +158,15 @@ Create new organization as... + + Organization name cannot be empty. You need to give the new organization a name! + You can create a new organization either as a new standalone organization, or as a child organization of the current one. (Everybody with responsibilities in a parent organization automatically has corresponding rights and privileges in all its children.) + + New Organization Name + Operating currency diff --git a/Site/Pages/v5/Admin/CreateOrganization.aspx b/Site/Pages/v5/Admin/CreateOrganization.aspx index bb6d4b0f..7cf6168d 100644 --- a/Site/Pages/v5/Admin/CreateOrganization.aspx +++ b/Site/Pages/v5/Admin/CreateOrganization.aspx @@ -8,7 +8,13 @@ }); function validateFields() { - return true; // TODO: validate the input fields + var newOrganizationName = $('#<%=this.TextOrganizationName.ClientID%>').val(); + if (newOrganizationName.trim().length < 1) { + alertify.error(SwarmopsJS.unescape('<%=this.Localized_Error_OrganizationNameCannotBeEmpty%>')); + $('#<%=this.TextOrganizationName.ClientID%>').focus(); + return false; + } + return true; } diff --git a/Site/Pages/v5/Admin/CreateOrganization.aspx.cs b/Site/Pages/v5/Admin/CreateOrganization.aspx.cs index 7187ee6b..37f6f3d8 100644 --- a/Site/Pages/v5/Admin/CreateOrganization.aspx.cs +++ b/Site/Pages/v5/Admin/CreateOrganization.aspx.cs @@ -46,10 +46,10 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.DropCurrencies.Items.Clear(); this.DropCreateChild.Items.Clear(); this.DropPositionLabel.Items.Clear(); - this.DropPersonLabel.Items.Add (new ListItem (Global.Global_SelectOne, "0")); - this.DropActivistLabel.Items.Add (new ListItem (Global.Global_SelectOne, "0")); - this.DropCurrencies.Items.Add (new ListItem (Global.Global_SelectOne, "0")); - this.DropCreateChild.Items.Add (new ListItem (Global.Global_SelectOne, "0")); + //this.DropPersonLabel.Items.Add (new ListItem (Global.Global_SelectOne, "0")); + //this.DropActivistLabel.Items.Add (new ListItem (Global.Global_SelectOne, "0")); + //this.DropCurrencies.Items.Add (new ListItem (Global.Global_SelectOne, "0")); + //this.DropCreateChild.Items.Add (new ListItem (Global.Global_SelectOne, "0")); this.DropPositionLabel.Items.Add (new ListItem(Resources.Pages.Admin.CreateOrganization_Titles_Nonprofit, "Nonprofit")); this.DropPositionLabel.Items.Add (new ListItem(Resources.Pages.Admin.CreateOrganization_Titles_Commercial, "Commercial")); @@ -77,6 +77,9 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.DropPersonLabel.Items.Add (new ListItem (parts[0], parts[1])); this.DropActivistLabel.Items.Add (new ListItem (parts[0], parts[1])); } + + this.DropPersonLabel.SelectedValue = "Member"; + this.DropActivistLabel.SelectedValue = "Activist"; Currencies currencies = Currencies.GetAll(); @@ -87,6 +90,9 @@ namespace Swarmops.Frontend.Pages.v5.Admin currencyStrings.Add (String.Format ("{0} {1}|{0}", currency.Code, currency.Name)); } + this.TextOrganizationName.Attributes["Placeholder"] = Resources.Pages.Admin.CreateOrganization_NewOrganizationName; + this.TextOrganizationName.Focus(); + currencyStrings.Sort(); foreach (string currencyString in currencyStrings) @@ -95,6 +101,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.DropCurrencies.Items.Add (new ListItem (parts[0], parts[1])); } + this.DropCurrencies.SelectedValue = "BTC"; } @@ -151,5 +158,17 @@ namespace Swarmops.Frontend.Pages.v5.Admin newOrganization.Identity.ToString (CultureInfo.InvariantCulture) + "&ReturnUrl=/Admin/OrgSettings", true); } + + // ReSharper disable InconsistentNaming + + public string Localized_Error_OrganizationNameCannotBeEmpty + { + get + { + return + CommonV5.JavascriptEscape( + Resources.Pages.Admin.CreateOrganization_Error_OrganizationNameCannotBeEmpty); + } + } } } \ No newline at end of file