Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit bc2b206

Browse files
committed
fix(base): Fix add BaseAppModule to index.ts on makeTsList method
1 parent effeb77 commit bc2b206

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

srcgen/utils-make.list.ts.files/loader#.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ recursive(scanPath, ['!*.ts', '*node_modules*'], function (err, files) {
9999
founded = true;
100100
}
101101
}
102-
if (!founded && '/index' !== classFile && className.indexOf('AppModule') === -1) {
102+
if (!founded && '/index' !== classFile && (
103+
className.indexOf('AppModule') === -1 || className.indexOf('BaseAppModule') !== -1
104+
)) {
103105
var importLine = 'import { ' + className + ' } from \'.' + classFile + '\';';
104106
exportArray.push(importLine);
105107
var exportLine = 'export { ' + className + ' } from \'.' + classFile + '\';';

srcgen/web-app-empty/apps/%app.name%/src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {
3636
PositioningService,
3737
TabsetConfig,
3838
TooltipConfig,
39+
BsLocaleService
3940
} from 'ngx-bootstrap';
4041

4142
import {
@@ -76,6 +77,7 @@ import {
7677
PaginationConfig,
7778
TabsetConfig,
7879
PopoverConfig,
80+
BsLocaleService,
7981
RuckenCoreServices,
8082
RuckenWebServices,
8183
<%=app.classPrefix%>CoreServices,

srcgen/web-app-empty/apps/%app.name%/src/app/shared/guards/home-guard.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ export class <%=app.classPrefix%>HomeGuardService extends AuthGuardService {
2929
this.initAccesses();
3030
}
3131
if (this.accountService.account && route.data.name && route.data.name === 'home' && this.firstHomeActivated) {
32-
let founded = false;
3332
/* todo: uncomment this, if you want redirect from home page to specific user page, detected with permission
33+
let founded = false;
3434
if (!founded && this.accessToReadAdminPage) {
3535
founded = true;
3636
this.router.navigate(['/admin']);
3737
}
3838
if (!founded && this.accessToReadAccountPage) {
3939
founded = true;
4040
this.router.navigate(['/account']);
41-
}*/
41+
}
4242
if (!founded) {
4343
this.app.component.showErrorModal(
4444
this.translateService.instant('Not access')
4545
);
4646
return false;
4747
} else {
4848
this.firstHomeActivated = false;
49-
}
49+
}*/
5050
}
5151
return true;
5252
}

0 commit comments

Comments
 (0)