Browse Source

Resolved #524

pull/594/head
Yunus Emre Kalkan 8 years ago
parent
commit
aecfb6426b
  1. 6
      abp_io/src/Volo.AbpWebSite.Web/Pages/Templates.cshtml
  2. 1
      abp_io/src/Volo.AbpWebSite.Web/Pages/Templates.cshtml.cs
  3. 10
      abp_io/src/Volo.AbpWebSite.Web/Pages/templates.js

6
abp_io/src/Volo.AbpWebSite.Web/Pages/Templates.cshtml

@ -1,5 +1,6 @@
@page @page
@using Volo.AbpWebSite @using Volo.AbpWebSite
@using Volo.AbpWebSite.Pages
@model Volo.AbpWebSite.Pages.TemplatesModel @model Volo.AbpWebSite.Pages.TemplatesModel
@{ @{
ViewBag.PageTitle = "Get Started"; ViewBag.PageTitle = "Get Started";
@ -24,7 +25,7 @@
<div class="form-group"> <div class="form-group">
<label for="CompanyAndProjectName">Project Name (as <i>YourProjectName</i> or <i>YourCompanyName.YourProjectName</i>):</label> <label for="CompanyAndProjectName">Project Name (as <i>YourProjectName</i> or <i>YourCompanyName.YourProjectName</i>):</label>
<input class="form-control" name="CompanyAndProjectName" value="@Model.CompanyAndProjectName"> <input class="form-control" name="CompanyAndProjectName" id="CompanyAndProjectName" value="@Model.CompanyAndProjectName" data-regex="^@(TemplatesModel.ProjectNameRegEx)?$">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -77,4 +78,5 @@
} }
</div> </div>
</div> </div>
<input hidden id="ProjectRegex" value="@TemplatesModel.ProjectNameRegEx"/>

1
abp_io/src/Volo.AbpWebSite.Web/Pages/Templates.cshtml.cs

@ -13,6 +13,7 @@ namespace Volo.AbpWebSite.Pages
{ {
private readonly SolutionBuilder _solutionBuilder; private readonly SolutionBuilder _solutionBuilder;
private readonly IConfigurationAccessor _configurationAccessor; private readonly IConfigurationAccessor _configurationAccessor;
public const string ProjectNameRegEx = @"^[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]*)?$";
public TemplatesModel(SolutionBuilder solutionBuilder, IConfigurationAccessor configurationAccessor) public TemplatesModel(SolutionBuilder solutionBuilder, IConfigurationAccessor configurationAccessor)
{ {

10
abp_io/src/Volo.AbpWebSite.Web/Pages/templates.js

@ -7,5 +7,15 @@
$('#DatabaseProviderFormGroup').hide('fast'); $('#DatabaseProviderFormGroup').hide('fast');
} }
}); });
$("form").submit(function (event) {
var regex = $("#ProjectRegex").val();
var patt = new RegExp(regex);
var res = patt.test($("#CompanyAndProjectName").val());
if (!res) {
abp.message.error("Invalid Project Name.","");
event.preventDefault();
}
});
}); });
})(jQuery); })(jQuery);
Loading…
Cancel
Save