Update roles!
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>WebDoorCreator - Egalware</i>
|
||||
<h4>Version: 0.9.2305.3021</h4>
|
||||
<h4>Version: 0.9.2305.3108</h4>
|
||||
<br /> Release note:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.9.2305.3021
|
||||
0.9.2305.3108
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>0.9.2305.3021</version>
|
||||
<version>0.9.2305.3108</version>
|
||||
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
|
||||
<changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
Id = "2d778017-0768-47f4-b807-9094d4aa39c7",
|
||||
ConcurrencyStamp = "b83e70eb-09cd-4ac7-8571-c821029ae152",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
{ "0bef594b-861c-4c48-b967-c408174074c6", "a470e2f3-6c5e-4123-bf2e-f6f8b4d11328", "Undef", "UNDEF" },
|
||||
{ "2bdc3737-48c3-4340-b55d-1739eec7aede", "980f5e55-80d8-466d-8451-746acfa837d4", "SuperAdmin", "SUPERADMIN" },
|
||||
{ "2d778017-0768-47f4-b807-9094d4aa39c7", "b83e70eb-09cd-4ac7-8571-c821029ae152", "Admin", "ADMIN" },
|
||||
{ "2d778017-0768-47f4-b807-9094d4aa39c7", "b83e70eb-09cd-4ac7-8571-c821029ae152", "DcaAdmin", "DCAADMIN" },
|
||||
{ "585875c2-1787-4c33-aa4d-dfa37ada8766", "0b6d6096-d9b8-4abe-a6b7-4adac55afc37", "CompAdmin", "COMPADMIN" },
|
||||
{ "7444754d-5643-461b-a3c1-aeb8665631d7", "9e3fac4e-50ec-437d-a968-a976ecdc27b5", "CompUser", "COMPUSER" },
|
||||
{ "9c1c4523-526d-4efa-af94-a24cb04312b8", "9ab5dd98-2d81-4baf-b01c-62c0c893c086", "User", "USER" }
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
Id = "be0e13af-b32e-490d-b798-36e090e91727",
|
||||
ConcurrencyStamp = "8bf806ed-63c9-4f86-b20e-836296469772",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{ "31011aea-c9a3-4f34-a9fd-7b7a4bcbefa6", "32cd475f-bbe2-4940-bfd1-fe26cafd4fae", "Undef", "UNDEF" },
|
||||
{ "a5ab56f6-fba3-434d-b316-e5bac2631411", "22a4245e-1026-4990-97ce-9e4a851b0f23", "CompAdmin", "COMPADMIN" },
|
||||
{ "b904f672-414e-4782-b0a5-30c4a0d952f5", "f5e19beb-0c79-41b7-9dee-9b276454eaf8", "CompUser", "COMPUSER" },
|
||||
{ "be0e13af-b32e-490d-b798-36e090e91727", "8bf806ed-63c9-4f86-b20e-836296469772", "Admin", "ADMIN" },
|
||||
{ "be0e13af-b32e-490d-b798-36e090e91727", "8bf806ed-63c9-4f86-b20e-836296469772", "DcaAdmin", "DCAADMIN" },
|
||||
{ "c9cb6d11-c9a5-43d8-bd04-70be1724ba4a", "07b2ba6d-4f23-43d1-b48c-5b05d14b7e7e", "SuperAdmin", "SUPERADMIN" }
|
||||
});
|
||||
|
||||
@@ -110,7 +110,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
{ "0bef594b-861c-4c48-b967-c408174074c6", "a470e2f3-6c5e-4123-bf2e-f6f8b4d11328", "Undef", "UNDEF" },
|
||||
{ "2bdc3737-48c3-4340-b55d-1739eec7aede", "980f5e55-80d8-466d-8451-746acfa837d4", "SuperAdmin", "SUPERADMIN" },
|
||||
{ "2d778017-0768-47f4-b807-9094d4aa39c7", "b83e70eb-09cd-4ac7-8571-c821029ae152", "Admin", "ADMIN" },
|
||||
{ "2d778017-0768-47f4-b807-9094d4aa39c7", "b83e70eb-09cd-4ac7-8571-c821029ae152", "DcaAdmin", "DCAADMIN" },
|
||||
{ "585875c2-1787-4c33-aa4d-dfa37ada8766", "0b6d6096-d9b8-4abe-a6b7-4adac55afc37", "CompAdmin", "COMPADMIN" },
|
||||
{ "7444754d-5643-461b-a3c1-aeb8665631d7", "9e3fac4e-50ec-437d-a968-a976ecdc27b5", "CompUser", "COMPUSER" },
|
||||
{ "9c1c4523-526d-4efa-af94-a24cb04312b8", "9ab5dd98-2d81-4baf-b01c-62c0c893c086", "User", "USER" }
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
Id = "f5f76968-2225-482a-82ac-f54bd05390b3",
|
||||
ConcurrencyStamp = "b54f1873-a97b-4bb1-9e61-7bd2db0a2316",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{ "549ec954-a966-484c-8db8-c7d839e8c4af", "84b61e19-8786-45e4-8977-af6466a87878", "User", "USER" },
|
||||
{ "6abfe01f-48f9-4a48-8e49-ac5f29a8753a", "e981295d-29b1-4805-a70e-3c83dc4bcfd7", "CompAdmin", "COMPADMIN" },
|
||||
{ "7fb23328-c054-4b3d-92e0-f949745c8924", "d795b502-0429-4271-a12d-2549f1eb1b17", "Undef", "UNDEF" },
|
||||
{ "f5f76968-2225-482a-82ac-f54bd05390b3", "b54f1873-a97b-4bb1-9e61-7bd2db0a2316", "Admin", "ADMIN" }
|
||||
{ "f5f76968-2225-482a-82ac-f54bd05390b3", "b54f1873-a97b-4bb1-9e61-7bd2db0a2316", "DcaAdmin", "DCAADMIN" }
|
||||
});
|
||||
|
||||
migrationBuilder.InsertData(
|
||||
@@ -122,7 +122,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{ "31011aea-c9a3-4f34-a9fd-7b7a4bcbefa6", "32cd475f-bbe2-4940-bfd1-fe26cafd4fae", "Undef", "UNDEF" },
|
||||
{ "a5ab56f6-fba3-434d-b316-e5bac2631411", "22a4245e-1026-4990-97ce-9e4a851b0f23", "CompAdmin", "COMPADMIN" },
|
||||
{ "b904f672-414e-4782-b0a5-30c4a0d952f5", "f5e19beb-0c79-41b7-9dee-9b276454eaf8", "CompUser", "COMPUSER" },
|
||||
{ "be0e13af-b32e-490d-b798-36e090e91727", "8bf806ed-63c9-4f86-b20e-836296469772", "Admin", "ADMIN" },
|
||||
{ "be0e13af-b32e-490d-b798-36e090e91727", "8bf806ed-63c9-4f86-b20e-836296469772", "DcaAdmin", "DCAADMIN" },
|
||||
{ "c9cb6d11-c9a5-43d8-bd04-70be1724ba4a", "07b2ba6d-4f23-43d1-b48c-5b05d14b7e7e", "SuperAdmin", "SUPERADMIN" }
|
||||
});
|
||||
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
Id = "0fe4015b-cf98-4229-a120-57eb9c2ca945",
|
||||
ConcurrencyStamp = "ccb4b655-3619-463d-a702-d0c9497e772c",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
|
||||
values: new object[,]
|
||||
{
|
||||
{ "0fe4015b-cf98-4229-a120-57eb9c2ca945", "ccb4b655-3619-463d-a702-d0c9497e772c", "Admin", "ADMIN" },
|
||||
{ "0fe4015b-cf98-4229-a120-57eb9c2ca945", "ccb4b655-3619-463d-a702-d0c9497e772c", "DcaAdmin", "DCAADMIN" },
|
||||
{ "1f63e241-4a96-437c-9af9-55748e0f6ed5", "684c9e79-7c20-4e25-ade2-66529980ef38", "Undef", "UNDEF" },
|
||||
{ "34e09fbe-45db-4225-af17-793b4a0f90a1", "3895c7f6-8f63-4c30-9f93-0af0504f5e91", "CompUser", "COMPUSER" },
|
||||
{ "9dfb7941-838f-483e-b1c2-10e01abb3d2d", "15368102-cd08-46cf-a376-dbbc8c6a8f71", "User", "USER" },
|
||||
@@ -135,7 +135,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{ "549ec954-a966-484c-8db8-c7d839e8c4af", "84b61e19-8786-45e4-8977-af6466a87878", "User", "USER" },
|
||||
{ "6abfe01f-48f9-4a48-8e49-ac5f29a8753a", "e981295d-29b1-4805-a70e-3c83dc4bcfd7", "CompAdmin", "COMPADMIN" },
|
||||
{ "7fb23328-c054-4b3d-92e0-f949745c8924", "d795b502-0429-4271-a12d-2549f1eb1b17", "Undef", "UNDEF" },
|
||||
{ "f5f76968-2225-482a-82ac-f54bd05390b3", "b54f1873-a97b-4bb1-9e61-7bd2db0a2316", "Admin", "ADMIN" }
|
||||
{ "f5f76968-2225-482a-82ac-f54bd05390b3", "b54f1873-a97b-4bb1-9e61-7bd2db0a2316", "DcaAdmin", "DCAADMIN" }
|
||||
});
|
||||
|
||||
migrationBuilder.InsertData(
|
||||
|
||||
@@ -69,8 +69,8 @@ namespace WebDoorCreator.Data.Migrations
|
||||
{
|
||||
Id = "4225aeef-4a9b-4629-bbb2-4f3ea6c93595",
|
||||
ConcurrencyStamp = "2a53a882-ccfd-46f5-8c31-04e5945bfc07",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
|
||||
values: new object[,]
|
||||
{
|
||||
{ "4225aeef-4a9b-4629-bbb2-4f3ea6c93595", "2a53a882-ccfd-46f5-8c31-04e5945bfc07", "Admin", "ADMIN" },
|
||||
{ "4225aeef-4a9b-4629-bbb2-4f3ea6c93595", "2a53a882-ccfd-46f5-8c31-04e5945bfc07", "DcaAdmin", "DCAADMIN" },
|
||||
{ "7d3b9719-8a33-4790-b0ce-9df3552458f3", "f271ed2d-48dc-4293-b485-15cfb28b3ce7", "Undef", "UNDEF" },
|
||||
{ "7f512221-c37f-438c-920a-76458e217611", "315f6b4a-8700-4ae7-a74b-37a70fbc1c90", "User", "USER" },
|
||||
{ "820b2520-2f28-47cc-8453-ea6871f6e0e6", "0ea8eb3e-972e-4a40-b265-f892335e3db0", "CompUser", "COMPUSER" },
|
||||
@@ -140,7 +140,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
|
||||
values: new object[,]
|
||||
{
|
||||
{ "0fe4015b-cf98-4229-a120-57eb9c2ca945", "ccb4b655-3619-463d-a702-d0c9497e772c", "Admin", "ADMIN" },
|
||||
{ "0fe4015b-cf98-4229-a120-57eb9c2ca945", "ccb4b655-3619-463d-a702-d0c9497e772c", "DcaAdmin", "DCAADMIN" },
|
||||
{ "1f63e241-4a96-437c-9af9-55748e0f6ed5", "684c9e79-7c20-4e25-ade2-66529980ef38", "Undef", "UNDEF" },
|
||||
{ "34e09fbe-45db-4225-af17-793b4a0f90a1", "3895c7f6-8f63-4c30-9f93-0af0504f5e91", "CompUser", "COMPUSER" },
|
||||
{ "9dfb7941-838f-483e-b1c2-10e01abb3d2d", "15368102-cd08-46cf-a376-dbbc8c6a8f71", "User", "USER" },
|
||||
|
||||
@@ -97,7 +97,7 @@ namespace WebDoorCreator.Data.Migrations
|
||||
columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
|
||||
values: new object[,]
|
||||
{
|
||||
{ "4225aeef-4a9b-4629-bbb2-4f3ea6c93595", "2a53a882-ccfd-46f5-8c31-04e5945bfc07", "Admin", "ADMIN" },
|
||||
{ "4225aeef-4a9b-4629-bbb2-4f3ea6c93595", "2a53a882-ccfd-46f5-8c31-04e5945bfc07", "DcaAdmin", "DCAADMIN" },
|
||||
{ "7d3b9719-8a33-4790-b0ce-9df3552458f3", "f271ed2d-48dc-4293-b485-15cfb28b3ce7", "Undef", "UNDEF" },
|
||||
{ "7f512221-c37f-438c-920a-76458e217611", "315f6b4a-8700-4ae7-a74b-37a70fbc1c90", "User", "USER" },
|
||||
{ "820b2520-2f28-47cc-8453-ea6871f6e0e6", "0ea8eb3e-972e-4a40-b265-f892335e3db0", "CompUser", "COMPUSER" },
|
||||
|
||||
+2
-2
@@ -62,8 +62,8 @@ namespace WebDoorCreator.Data.Migrations.WDCData
|
||||
{
|
||||
Id = "851dd9d6-570c-48b0-ac48-e494c5fac5d7",
|
||||
ConcurrencyStamp = "13d724e3-b415-4719-8387-e21952306ce3",
|
||||
Name = "Admin",
|
||||
NormalizedName = "ADMIN"
|
||||
Name = "DcaAdmin",
|
||||
NormalizedName = "DCAADMIN"
|
||||
},
|
||||
new
|
||||
{
|
||||
|
||||
@@ -106,7 +106,7 @@ namespace WebDoorCreator.Data.Migrations.WDCData
|
||||
{ "246c1608-059d-4f2b-98b2-f57ab47de3b7", "1b81eff5-4ff6-4756-9bb5-983869fd4b41", "CompAdmin", "COMPADMIN" },
|
||||
{ "695e212d-f79c-45dd-931d-6390c4533c6e", "a4788fda-3f24-41dc-b492-a621de69f031", "SuperAdmin", "SUPERADMIN" },
|
||||
{ "805c6051-0372-4e2b-9b94-f5c8881ef7cb", "a73832bd-be3e-4a48-8b0a-475c8930b4c5", "CompUser", "COMPUSER" },
|
||||
{ "851dd9d6-570c-48b0-ac48-e494c5fac5d7", "13d724e3-b415-4719-8387-e21952306ce3", "Admin", "ADMIN" },
|
||||
{ "851dd9d6-570c-48b0-ac48-e494c5fac5d7", "13d724e3-b415-4719-8387-e21952306ce3", "DcaAdmin", "DCAADMIN" },
|
||||
{ "d0cafb49-7d19-4d4f-a280-6837e5842e8b", "7f94eb48-1f91-4e88-bae6-bb655dba168b", "User", "USER" }
|
||||
});
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ namespace WebDoorCreator.Data.Migrations.WDCData
|
||||
{ "246c1608-059d-4f2b-98b2-f57ab47de3b7", "1b81eff5-4ff6-4756-9bb5-983869fd4b41", "CompAdmin", "COMPADMIN" },
|
||||
{ "695e212d-f79c-45dd-931d-6390c4533c6e", "a4788fda-3f24-41dc-b492-a621de69f031", "SuperAdmin", "SUPERADMIN" },
|
||||
{ "805c6051-0372-4e2b-9b94-f5c8881ef7cb", "a73832bd-be3e-4a48-8b0a-475c8930b4c5", "CompUser", "COMPUSER" },
|
||||
{ "851dd9d6-570c-48b0-ac48-e494c5fac5d7", "13d724e3-b415-4719-8387-e21952306ce3", "Admin", "ADMIN" },
|
||||
{ "851dd9d6-570c-48b0-ac48-e494c5fac5d7", "13d724e3-b415-4719-8387-e21952306ce3", "DcaAdmin", "DCAADMIN" },
|
||||
{ "d0cafb49-7d19-4d4f-a280-6837e5842e8b", "7f94eb48-1f91-4e88-bae6-bb655dba168b", "User", "USER" }
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18,7 +18,9 @@ namespace WebDoorCreator.Data
|
||||
builder.HasData(
|
||||
new IdentityRole { Name = "Undef", NormalizedName = "UNDEF" },
|
||||
new IdentityRole { Name = "SuperAdmin", NormalizedName = "SUPERADMIN" },
|
||||
new IdentityRole { Name = "Admin", NormalizedName = "ADMIN" },
|
||||
new IdentityRole { Name = "DcaAdmin", NormalizedName = "DCAADMIN" },
|
||||
new IdentityRole { Name = "DcaOrdMan", NormalizedName = "DCAORDMAN" },
|
||||
new IdentityRole { Name = "DcaProj", NormalizedName = "DCAPROJ" },
|
||||
new IdentityRole { Name = "CompAdmin", NormalizedName = "COMPADMIN" },
|
||||
new IdentityRole { Name = "CompUser", NormalizedName = "COMPUSER" },
|
||||
new IdentityRole { Name = "User", NormalizedName = "USER" }
|
||||
|
||||
@@ -1503,7 +1503,7 @@ namespace WebDoorCreator.Data.Services
|
||||
public async Task<bool> FlushCustomPattern(string keyWord)
|
||||
{
|
||||
await Task.Delay(1);
|
||||
RedisValue pattern = new RedisValue($"{Constants.redisBaseAddr}:{keyWord}");
|
||||
RedisValue pattern = new RedisValue($"{Constants.redisBaseAddr}:{keyWord}*");
|
||||
bool answ = await ExecFlushRedisPattern(pattern);
|
||||
return answ;
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ else
|
||||
<AuthorizeView Roles="SuperAdmin, Admin, CompAdmin">
|
||||
<Authorized>
|
||||
<span class="input-group-text"><i class="fa-solid fa-building"></i></span>
|
||||
@if (@context.User.IsInRole("SuperAdmin") || @context.User.IsInRole("Admin"))
|
||||
@if (@context.User.IsInRole("SuperAdmin") || @context.User.IsInRole("DcaAdmin"))
|
||||
{
|
||||
<select class="form-select" @bind="@FiltCompany">
|
||||
<option value="0">--- ALL COMPANIES ---</option>
|
||||
|
||||
@@ -129,10 +129,6 @@ namespace WebDoorCreator.UI.Pages
|
||||
[Inject]
|
||||
protected RoleManager<IdentityRole> _RoleManager { get; set; } = null!;
|
||||
|
||||
|
||||
[Inject]
|
||||
protected WDCUserService WDCUService { get; set; } = null!;
|
||||
|
||||
[Inject]
|
||||
protected UserManager<IdentityUser> _UserManager { get; set; } = null!;
|
||||
|
||||
@@ -141,6 +137,8 @@ namespace WebDoorCreator.UI.Pages
|
||||
|
||||
protected List<CompanyModel> CompanyList { get; set; } = new List<CompanyModel>();
|
||||
|
||||
protected IdentityUser currUser { get; set; } = new IdentityUser();
|
||||
|
||||
[Inject]
|
||||
protected IJSRuntime JSRuntime { get; set; } = null!;
|
||||
|
||||
@@ -177,6 +175,9 @@ namespace WebDoorCreator.UI.Pages
|
||||
[Inject]
|
||||
protected WebDoorCreatorService WDCService { get; set; } = null!;
|
||||
|
||||
[Inject]
|
||||
protected WDCUserService WDCUService { get; set; } = null!;
|
||||
|
||||
[Inject]
|
||||
protected WDCUserService WDCUsrServ { get; set; } = null!;
|
||||
|
||||
@@ -194,12 +195,6 @@ namespace WebDoorCreator.UI.Pages
|
||||
currPage = newNum;
|
||||
}
|
||||
|
||||
protected IdentityUser currUser { get; set; } = new IdentityUser();
|
||||
string currUserRole
|
||||
{
|
||||
get => WDCUService.userRole;
|
||||
}
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
searchVal = "";
|
||||
@@ -234,7 +229,7 @@ namespace WebDoorCreator.UI.Pages
|
||||
/// <summary>
|
||||
/// Elenco ROLES da mostrare in dropdown durante editing (1 solo? usare DB?!?)
|
||||
/// </summary>
|
||||
private List<string> RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin", "Admin", "SuperAdmin" };
|
||||
private List<string> RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin" };
|
||||
|
||||
// To enable showing the Popup
|
||||
private bool ShowPopup = false;
|
||||
@@ -258,10 +253,15 @@ namespace WebDoorCreator.UI.Pages
|
||||
#region Private Properties
|
||||
|
||||
private string _CurrClaimType { get; set; } = "None";
|
||||
|
||||
private int _currPage { get; set; } = 1;
|
||||
|
||||
private string _filtCompanyId { get; set; } = "0";
|
||||
|
||||
private string _filtUserRole { get; set; } = "0";
|
||||
|
||||
private int _numRecord { get; set; } = 10;
|
||||
|
||||
private string _searchVal { get; set; } = "";
|
||||
|
||||
[CascadingParameter]
|
||||
@@ -316,6 +316,11 @@ namespace WebDoorCreator.UI.Pages
|
||||
}
|
||||
}
|
||||
|
||||
private string currUserRole
|
||||
{
|
||||
get => WDCUService.userRole;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gestione filtraggio COMPANY
|
||||
/// </summary>
|
||||
@@ -542,17 +547,21 @@ namespace WebDoorCreator.UI.Pages
|
||||
RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin" };
|
||||
if (currUserRole == "SuperAdmin")
|
||||
{
|
||||
RolesList.Add("Admin");
|
||||
RolesList.Add("DcaOrdMan");
|
||||
RolesList.Add("DcaProj");
|
||||
RolesList.Add("DcaAdmin");
|
||||
RolesList.Add("SuperAdmin");
|
||||
}
|
||||
else if (currUserRole == "Admin")
|
||||
else if (currUserRole == "DcaAdmin")
|
||||
{
|
||||
RolesList.Add("Admin");
|
||||
RolesList.Add("DcaOrdMan");
|
||||
RolesList.Add("DcaProj");
|
||||
RolesList.Add("DcaAdmin");
|
||||
}
|
||||
else
|
||||
{
|
||||
FiltCompany = $"{WDCUsrServ.userCurrComp}";
|
||||
CompanyList= await WDCService.CompanyGetByKey(WDCUsrServ.userCurrComp);
|
||||
CompanyList = await WDCService.CompanyGetByKey(WDCUsrServ.userCurrComp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -695,25 +704,5 @@ namespace WebDoorCreator.UI.Pages
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
|
||||
protected List<string> getRoleListFilt()
|
||||
{
|
||||
//List<string> RolesList = new List<string>();
|
||||
|
||||
if (currUserRole == "SuperAdmin")
|
||||
{
|
||||
RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin", "Admin", "SuperAdmin" };
|
||||
}
|
||||
else if (currUserRole == "Admin")
|
||||
{
|
||||
RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin", "Admin" };
|
||||
}
|
||||
else if (currUserRole == "CompAdmin")
|
||||
{
|
||||
RolesList = new List<string>() { "Undef", "User", "CompUser", "CompAdmin" };
|
||||
}
|
||||
|
||||
return RolesList;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,12 +17,7 @@
|
||||
<div class="input-group mb-3">
|
||||
@if (keyWord != "")
|
||||
{
|
||||
<button class="btn btn-lg btn-outline-primary" @onclick="()=>FlushCustomPattern()">DO FLUSH CACHE BY KEYWORD)</button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-lg btn-outline-secondary" @onclick="()=>FlushCustomPattern()">DO FLUSH CACHE BY KEYWORD</button>
|
||||
|
||||
<button class="btn btn-lg btn-outline-primary" @onclick="()=>FlushCustomPattern()">DO FLUSH CACHE BY KEYWORD</button>
|
||||
}
|
||||
<input type="text" class="form-control" placeholder="" @bind="@keyWord">
|
||||
</div>
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace WebDoorCreator.UI.Pages
|
||||
{
|
||||
public partial class Utils
|
||||
{
|
||||
protected string _keyWord { get; set; } = "";
|
||||
protected string _keyWord { get; set; } = "Cache";
|
||||
[Inject]
|
||||
protected IConfiguration config { get; set; } = null!;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>0.9.2305.3021</Version>
|
||||
<Version>0.9.2305.3108</Version>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in New Issue
Block a user