Added some validation to Create Org

This commit is contained in:
Rick Falkvinge
2016-12-18 19:29:44 +01:00
parent dd546a3789
commit e2bda227ba
4 changed files with 54 additions and 5 deletions
+18
View File
@@ -168,6 +168,15 @@ namespace Resources.Pages {
}
}
/// <summary>
/// Looks up a localized string similar to Organization name cannot be empty. You need to give the new organization a name!.
/// </summary>
internal static string CreateOrganization_Error_OrganizationNameCannotBeEmpty {
get {
return ResourceManager.GetString("CreateOrganization_Error_OrganizationNameCannotBeEmpty", resourceCulture);
}
}
/// <summary>
/// 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.).
/// </summary>
@@ -177,6 +186,15 @@ namespace Resources.Pages {
}
}
/// <summary>
/// Looks up a localized string similar to New Organization Name.
/// </summary>
internal static string CreateOrganization_NewOrganizationName {
get {
return ResourceManager.GetString("CreateOrganization_NewOrganizationName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Operating currency.
/// </summary>
@@ -158,9 +158,15 @@
<data name="CreateOrganization_CreateNewOrgAs" xml:space="preserve">
<value>Create new organization as...</value>
</data>
<data name="CreateOrganization_Error_OrganizationNameCannotBeEmpty" xml:space="preserve">
<value>Organization name cannot be empty. You need to give the new organization a name!</value>
</data>
<data name="CreateOrganization_Info" xml:space="preserve">
<value>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.)</value>
</data>
<data name="CreateOrganization_NewOrganizationName" xml:space="preserve">
<value>New Organization Name</value>
</data>
<data name="CreateOrganization_NewOrgCurrency" xml:space="preserve">
<value>Operating currency</value>
</data>
+7 -1
View File
@@ -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;
}
</script>
+23 -4
View File
@@ -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);
}
}
}
}