Skip to content

Commit e624330

Browse files
committed
user and tenant pages made working.
1 parent 9454adf commit e624330

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

src/AbpCompanyName.AbpProjectName.Web/Views/Tenants/Index.cshtml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
@using Abp.MultiTenancy
2-
@using Abp.Web.Mvc.Extensions
32
@using AbpCompanyName.AbpProjectName.MultiTenancy
43
@model Abp.Application.Services.Dto.ListResultOutput<AbpCompanyName.AbpProjectName.MultiTenancy.Dto.TenantListDto>
54
@{
65
ViewBag.ActiveMenu = "Tenants"; //The menu item will be active for this page.
76
}
87
@section scripts
98
{
10-
@Html.IncludeScript("~/Views/Tenants/Index.js")
9+
<environment names="Development">
10+
<script src="~/view-resources/Views/Tenants/Index.js" asp-append-version="true"></script>
11+
</environment>
12+
13+
<environment names="Staging,Production">
14+
<script src="~/view-resources/Views/Tenants/Index.min.js" asp-append-version="true"></script>
15+
</environment>
1116
}
1217
<div>
1318
<h1>@L("Tenants")</h1>
@@ -34,7 +39,6 @@
3439
</div>
3540
</div>
3641
</div>
37-
3842
<div class="modal fade" id="TenantCreateModal" tabindex="-1" role="dialog" aria-labelledby="TenantCreateModalLabel" data-backdrop="static">
3943
<div class="modal-dialog" role="document">
4044
<div class="modal-content">
@@ -45,29 +49,23 @@
4549
</h4>
4650
</div>
4751
<div class="modal-body">
48-
4952
<div class="form-group">
5053
<label>@L("TenancyName")</label>
5154
<input class="form-control" type="text" name="TenancyName" required maxlength="@Tenant.MaxTenancyNameLength" minlength="2">
5255
</div>
53-
5456
<div class="form-group">
5557
<label>@L("Name")</label>
5658
<input type="text" name="Name" class="form-control" required maxlength="@Tenant.MaxNameLength">
5759
</div>
58-
5960
<div class="form-group">
6061
<label>@L("DatabaseConnectionString") (@L("Optional"))</label>
6162
<input type="text" name="ConnectionString" class="form-control" maxlength="@AbpTenantBase.MaxConnectionStringLength">
6263
</div>
63-
6464
<div class="form-group">
6565
<label>@L("AdminEmailAddress")</label>
6666
<input type="email" name="AdminEmailAddress" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Users.User.MaxEmailAddressLength">
6767
</div>
68-
6968
<p>@L("DefaultPasswordIs", AbpCompanyName.AbpProjectName.Users.User.DefaultPassword)</p>
70-
7169
</div>
7270
<div class="modal-footer">
7371
<button type="button" class="btn btn-default" data-dismiss="modal">@L("Cancel")</button>

src/AbpCompanyName.AbpProjectName.Web/Views/Users/Index.cshtml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
@using Abp.Authorization.Users
2-
@using Abp.Web.Mvc.Extensions
32
@model Abp.Application.Services.Dto.ListResultOutput<AbpCompanyName.AbpProjectName.Users.Dto.UserListDto>
43
@{
54
ViewBag.ActiveMenu = "Users"; //The menu item will be active for this page.
65
}
76
@section scripts
87
{
9-
@Html.IncludeScript("~/Views/Users/Index.js")
8+
<environment names="Development">
9+
<script src="~/view-resources/Views/Users/Index.js" asp-append-version="true"></script>
10+
</environment>
11+
12+
<environment names="Staging,Production">
13+
<script src="~/view-resources/Views/Users/Index.min.js" asp-append-version="true"></script>
14+
</environment>
1015
}
1116
<div>
1217
<h1>@L("Users")</h1>
@@ -37,7 +42,6 @@
3742
</div>
3843
</div>
3944
</div>
40-
4145
<div class="modal fade" id="UserCreateModal" tabindex="-1" role="dialog" aria-labelledby="UserCreateModalLabel" data-backdrop="static">
4246
<div class="modal-dialog" role="document">
4347
<div class="modal-content">
@@ -48,38 +52,31 @@
4852
</h4>
4953
</div>
5054
<div class="modal-body">
51-
5255
<div class="form-group">
5356
<label>@L("UserName")</label>
5457
<input class="form-control" type="text" name="UserName" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
5558
</div>
56-
5759
<div class="form-group">
5860
<label>@L("Name")</label>
5961
<input type="text" name="Name" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Users.User.MaxNameLength">
6062
</div>
61-
6263
<div class="form-group">
6364
<label>@L("Surname")</label>
6465
<input type="text" name="Surname" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Users.User.MaxSurnameLength">
6566
</div>
66-
6767
<div class="form-group">
6868
<label>@L("EmailAddress")</label>
6969
<input type="email" name="EmailAddress" class="form-control" maxlength="@AbpUserBase.MaxEmailAddressLength">
7070
</div>
71-
7271
<div class="form-group">
7372
<label>@L("Password")</label>
7473
<input type="password" name="Password" class="form-control" required maxlength="@AbpCompanyName.AbpProjectName.Users.User.MaxPlainPasswordLength">
7574
</div>
76-
7775
<div class="checkbox">
7876
<label>
7977
<input type="checkbox" name="IsActive" value="true" value="true" checked="checked"> @L("IsActive")
8078
</label>
8179
</div>
82-
8380
</div>
8481
<div class="modal-footer">
8582
<button type="button" class="btn btn-default" data-dismiss="modal">@L("Cancel")</button>

src/AbpCompanyName.AbpProjectName.Web/bundleconfig.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,17 @@
5454
"inputFiles": [
5555
"wwwroot/js/main.js"
5656
]
57+
},
58+
{
59+
"outputFileName": "wwwroot/view-resources/Views/Users/Index.min.js",
60+
"inputFiles": [
61+
"wwwroot/view-resources/Views/Users/Index.js"
62+
]
63+
},
64+
{
65+
"outputFileName": "wwwroot/view-resources/Views/Tenants/Index.min.js",
66+
"inputFiles": [
67+
"wwwroot/view-resources/Views/Tenants/Index.js"
68+
]
5769
}
5870
]

src/AbpCompanyName.AbpProjectName.Web/wwwroot/view-resources/Views/Tenants/Index.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AbpCompanyName.AbpProjectName.Web/wwwroot/view-resources/Views/Users/Index.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)