Skip to content

Commit 053a86f

Browse files
ismcagdasismcagdas
committed
#14: implementing tenant change on MVC project
1 parent 6be103b commit 053a86f

File tree

2,108 files changed

+389
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,108 files changed

+389
-135
lines changed

‎angular/src/account/account.component.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,11 @@ export class AccountComponent implements OnInit {
2525
}
2626

2727
showTenantChange(): boolean {
28-
return abp.multiTenancy.isEnabled && !this.supportsTenancyNameInUrl();
28+
return abp.multiTenancy.isEnabled;
2929
}
3030

3131
ngOnInit(): void {
3232
this._loginService.init();
3333
$('body').attr('class', 'page-md login');
3434
}
35-
36-
private supportsTenancyNameInUrl() {
37-
return (AppConsts.appBaseUrlFormat && AppConsts.appBaseUrlFormat.indexOf(AppConsts.tenancyNamePlaceHolderInUrl) >= 0);
38-
}
3935
}

‎angular/src/account/login/login.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class LoginService {
116116
if (initialUrl.indexOf('/login') > 0) {
117117
initialUrl = AppConsts.appBaseUrl;
118118
}
119-
debugger;
119+
120120
location.href = initialUrl;
121121
}
122122

‎angular/src/shared/AppConsts.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
export class AppConsts {
22

3-
static readonly tenancyNamePlaceHolderInUrl = "{TENANCY_NAME}";
4-
53
static remoteServiceBaseUrl: string;
64
static remoteServiceBaseUrlFormat: string;
75
static appBaseUrl: string;

‎aspnet-core/AbpCompanyName.AbpProjectName.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
global.json = global.json
1111
EndProjectSection
1212
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Web.Mvc", "src\AbpCompanyName.AbpProjectName.Web\AbpCompanyName.AbpProjectName.Web.Mvc.xproj", "{A2213374-BB48-48FD-BBD4-81E6A961D866}"
14-
EndProject
1513
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Core", "src\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.xproj", "{0FA75A5B-AB83-4FD0-B545-279774C01E87}"
1614
EndProject
1715
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Application", "src\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.xproj", "{3870C648-4AEA-4B85-BA3F-F2F63B96136A}"
@@ -28,16 +26,14 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectNa
2826
EndProject
2927
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Web.Core", "src\AbpCompanyName.AbpProjectName.Web.Core\AbpCompanyName.AbpProjectName.Web.Core.xproj", "{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}"
3028
EndProject
29+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Web.Mvc", "src\AbpCompanyName.AbpProjectName.Web.Mvc\AbpCompanyName.AbpProjectName.Web.Mvc.xproj", "{A2213374-BB48-48FD-BBD4-81E6A961D866}"
30+
EndProject
3131
Global
3232
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3333
Debug|Any CPU = Debug|Any CPU
3434
Release|Any CPU = Release|Any CPU
3535
EndGlobalSection
3636
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.Build.0 = Release|Any CPU
4137
{0FA75A5B-AB83-4FD0-B545-279774C01E87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4238
{0FA75A5B-AB83-4FD0-B545-279774C01E87}.Debug|Any CPU.Build.0 = Debug|Any CPU
4339
{0FA75A5B-AB83-4FD0-B545-279774C01E87}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,18 +62,22 @@ Global
6662
{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Debug|Any CPU.Build.0 = Debug|Any CPU
6763
{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Release|Any CPU.ActiveCfg = Release|Any CPU
6864
{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.Build.0 = Release|Any CPU
6969
EndGlobalSection
7070
GlobalSection(SolutionProperties) = preSolution
7171
HideSolutionNode = FALSE
7272
EndGlobalSection
7373
GlobalSection(NestedProjects) = preSolution
74-
{A2213374-BB48-48FD-BBD4-81E6A961D866} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
7574
{0FA75A5B-AB83-4FD0-B545-279774C01E87} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
7675
{3870C648-4AEA-4B85-BA3F-F2F63B96136A} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
7776
{0D4C5D00-C144-4213-A007-4B8944113AB1} = {F10AA149-2626-486E-85BB-9CD5365F3016}
7877
{DC780BC4-4EAC-4C63-9052-6F3169A59FA4} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
7978
{880B3591-E057-46FE-B525-10BD83828B93} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
8079
{38E184BD-E874-4633-A947-AED4FDB73F40} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
8180
{22CFE0D2-8DCA-42D7-AD7D-784C3862493F} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
81+
{A2213374-BB48-48FD-BBD4-81E6A961D866} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
8282
EndGlobalSection
8383
EndGlobal

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/.bowerrc‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/.bowerrc‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.Mvc.xproj‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.xproj‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/Controllers/AboutController.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AboutController.cs‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/Controllers/AccountController.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/Controllers/ErrorController.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/ErrorController.cs‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web/Controllers/HomeController.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/HomeController.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)