Skip to content

Commit c63001c

Browse files
committed
Fix illogical templateUrl paths. Add missed DenyRequestCopyComponent.
1 parent 50acff1 commit c63001c

8 files changed

Lines changed: 38 additions & 6 deletions

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Component } from '@angular/core';
2+
import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
3+
4+
import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component';
5+
6+
/**
7+
* Themed wrapper for deny-request-copy.component
8+
*/
9+
@Component({
10+
selector: 'ds-themed-deny-request-copy',
11+
styleUrls: [],
12+
templateUrl: './../../shared/theme-support/themed.component.html',
13+
})
14+
export class ThemedDenyRequestCopyComponent extends ThemedComponent<DenyRequestCopyComponent> {
15+
protected getComponentName(): string {
16+
return 'DenyRequestCopyComponent';
17+
}
18+
19+
protected importThemedComponent(themeName: string): Promise<any> {
20+
return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
21+
}
22+
23+
protected importUnthemedComponent(): Promise<any> {
24+
return import('./deny-request-copy.component');
25+
}
26+
}

src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { RequestCopyEmail } from './request-copy-email.model';
1212
styleUrls: [],
1313
templateUrl: './../../shared/theme-support/themed.component.html',
1414
})
15-
1615
export class ThemedEmailRequestCopyComponent extends ThemedComponent<EmailRequestCopyComponent> {
1716
/**
1817
* Event emitter for sending the email

src/app/request-copy/request-copy-routing.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
33
import { RequestCopyResolver } from './request-copy.resolver';
44
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
55
import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
6-
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
6+
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
77
import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
88

99
@NgModule({
@@ -21,7 +21,7 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
2121
},
2222
{
2323
path: REQUEST_COPY_DENY_PATH,
24-
component: DenyRequestCopyComponent,
24+
component: ThemedDenyRequestCopyComponent,
2525
},
2626
{
2727
path: REQUEST_COPY_GRANT_PATH,

src/app/request-copy/request-copy.module.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { SharedModule } from '../shared/shared.module';
44
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
55
import { RequestCopyRoutingModule } from './request-copy-routing.module';
66
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
7+
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
78
import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
89
import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
910
import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
@@ -18,11 +19,15 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
1819
declarations: [
1920
GrantDenyRequestCopyComponent,
2021
DenyRequestCopyComponent,
22+
ThemedDenyRequestCopyComponent,
2123
EmailRequestCopyComponent,
2224
ThemedEmailRequestCopyComponent,
2325
GrantRequestCopyComponent,
2426
ThemedGrantRequestCopyComponent,
2527
],
28+
exports: [
29+
ThemedEmailRequestCopyComponent,
30+
],
2631
providers: []
2732
})
2833

src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
// styleUrls: ['./deny-request-copy.component.scss'],
99
styleUrls: [],
1010
// templateUrl: './deny-request-copy.component.html',
11-
templateUrl: './../../request-copy/deny-request-copy/deny-request-copy.component.html',
11+
templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
1212
})
1313
export class DenyRequestCopyComponent
1414
extends BaseComponent {

src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
// styleUrls: ['./email-request-copy.component.scss'],
99
styleUrls: [],
1010
// templateUrl: './email-request-copy.component.html',
11-
templateUrl: './../../request-copy/email-request-copy/email-request-copy.component.html',
11+
templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
1212
})
1313
export class EmailRequestCopyComponent
1414
extends BaseComponent {

src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
// styleUrls: ['./grant-request-copy.component.scss'],
99
styleUrls: [],
1010
// templateUrl: './grant-request-copy.component.html',
11-
templateUrl: './../../request-copy/grant-request-copy/grant-request-copy.component.html',
11+
templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
1212
})
1313
export class GrantRequestCopyComponent
1414
extends BaseComponent {

src/themes/custom/lazy-theme.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
153153
import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
154154
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
155155
import { FormModule } from '../../app/shared/form/form.module';
156+
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
156157

157158
const DECLARATIONS = [
158159
FileSectionComponent,
@@ -293,6 +294,7 @@ const DECLARATIONS = [
293294
SystemWideAlertModule,
294295
NgxGalleryModule,
295296
FormModule,
297+
RequestCopyModule,
296298
],
297299
declarations: DECLARATIONS,
298300
exports: [

0 commit comments

Comments
 (0)