mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Fix illogical templateUrl paths. Add missed DenyRequestCopyComponent.
This commit is contained in:
@@ -0,0 +1,26 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
|
||||||
|
|
||||||
|
import { DenyRequestCopyComponent } from 'src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Themed wrapper for deny-request-copy.component
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'ds-themed-deny-request-copy',
|
||||||
|
styleUrls: [],
|
||||||
|
templateUrl: './../../shared/theme-support/themed.component.html',
|
||||||
|
})
|
||||||
|
export class ThemedDenyRequestCopyComponent extends ThemedComponent<DenyRequestCopyComponent> {
|
||||||
|
protected getComponentName(): string {
|
||||||
|
return 'DenyRequestCopyComponent';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected importThemedComponent(themeName: string): Promise<any> {
|
||||||
|
return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected importUnthemedComponent(): Promise<any> {
|
||||||
|
return import('./deny-request-copy.component');
|
||||||
|
}
|
||||||
|
}
|
@@ -12,7 +12,6 @@ import { RequestCopyEmail } from './request-copy-email.model';
|
|||||||
styleUrls: [],
|
styleUrls: [],
|
||||||
templateUrl: './../../shared/theme-support/themed.component.html',
|
templateUrl: './../../shared/theme-support/themed.component.html',
|
||||||
})
|
})
|
||||||
|
|
||||||
export class ThemedEmailRequestCopyComponent extends ThemedComponent<EmailRequestCopyComponent> {
|
export class ThemedEmailRequestCopyComponent extends ThemedComponent<EmailRequestCopyComponent> {
|
||||||
/**
|
/**
|
||||||
* Event emitter for sending the email
|
* Event emitter for sending the email
|
||||||
|
@@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router';
|
|||||||
import { RequestCopyResolver } from './request-copy.resolver';
|
import { RequestCopyResolver } from './request-copy.resolver';
|
||||||
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
|
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
|
||||||
import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
|
import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
|
||||||
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
|
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
|
||||||
import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
|
import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
@@ -21,7 +21,7 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: REQUEST_COPY_DENY_PATH,
|
path: REQUEST_COPY_DENY_PATH,
|
||||||
component: DenyRequestCopyComponent,
|
component: ThemedDenyRequestCopyComponent,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: REQUEST_COPY_GRANT_PATH,
|
path: REQUEST_COPY_GRANT_PATH,
|
||||||
|
@@ -4,6 +4,7 @@ import { SharedModule } from '../shared/shared.module';
|
|||||||
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
|
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
|
||||||
import { RequestCopyRoutingModule } from './request-copy-routing.module';
|
import { RequestCopyRoutingModule } from './request-copy-routing.module';
|
||||||
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
|
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
|
||||||
|
import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
|
||||||
import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
|
import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
|
||||||
import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
|
import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
|
||||||
import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
|
import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
|
||||||
@@ -18,11 +19,15 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
|
|||||||
declarations: [
|
declarations: [
|
||||||
GrantDenyRequestCopyComponent,
|
GrantDenyRequestCopyComponent,
|
||||||
DenyRequestCopyComponent,
|
DenyRequestCopyComponent,
|
||||||
|
ThemedDenyRequestCopyComponent,
|
||||||
EmailRequestCopyComponent,
|
EmailRequestCopyComponent,
|
||||||
ThemedEmailRequestCopyComponent,
|
ThemedEmailRequestCopyComponent,
|
||||||
GrantRequestCopyComponent,
|
GrantRequestCopyComponent,
|
||||||
ThemedGrantRequestCopyComponent,
|
ThemedGrantRequestCopyComponent,
|
||||||
],
|
],
|
||||||
|
exports: [
|
||||||
|
ThemedEmailRequestCopyComponent,
|
||||||
|
],
|
||||||
providers: []
|
providers: []
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@ import {
|
|||||||
// styleUrls: ['./deny-request-copy.component.scss'],
|
// styleUrls: ['./deny-request-copy.component.scss'],
|
||||||
styleUrls: [],
|
styleUrls: [],
|
||||||
// templateUrl: './deny-request-copy.component.html',
|
// templateUrl: './deny-request-copy.component.html',
|
||||||
templateUrl: './../../request-copy/deny-request-copy/deny-request-copy.component.html',
|
templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
|
||||||
})
|
})
|
||||||
export class DenyRequestCopyComponent
|
export class DenyRequestCopyComponent
|
||||||
extends BaseComponent {
|
extends BaseComponent {
|
||||||
|
@@ -8,7 +8,7 @@ import {
|
|||||||
// styleUrls: ['./email-request-copy.component.scss'],
|
// styleUrls: ['./email-request-copy.component.scss'],
|
||||||
styleUrls: [],
|
styleUrls: [],
|
||||||
// templateUrl: './email-request-copy.component.html',
|
// templateUrl: './email-request-copy.component.html',
|
||||||
templateUrl: './../../request-copy/email-request-copy/email-request-copy.component.html',
|
templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
|
||||||
})
|
})
|
||||||
export class EmailRequestCopyComponent
|
export class EmailRequestCopyComponent
|
||||||
extends BaseComponent {
|
extends BaseComponent {
|
||||||
|
@@ -8,7 +8,7 @@ import {
|
|||||||
// styleUrls: ['./grant-request-copy.component.scss'],
|
// styleUrls: ['./grant-request-copy.component.scss'],
|
||||||
styleUrls: [],
|
styleUrls: [],
|
||||||
// templateUrl: './grant-request-copy.component.html',
|
// templateUrl: './grant-request-copy.component.html',
|
||||||
templateUrl: './../../request-copy/grant-request-copy/grant-request-copy.component.html',
|
templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
|
||||||
})
|
})
|
||||||
export class GrantRequestCopyComponent
|
export class GrantRequestCopyComponent
|
||||||
extends BaseComponent {
|
extends BaseComponent {
|
||||||
|
@@ -153,6 +153,7 @@ import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
|
|||||||
import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
|
import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
|
||||||
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
|
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
|
||||||
import { FormModule } from '../../app/shared/form/form.module';
|
import { FormModule } from '../../app/shared/form/form.module';
|
||||||
|
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
|
||||||
|
|
||||||
const DECLARATIONS = [
|
const DECLARATIONS = [
|
||||||
FileSectionComponent,
|
FileSectionComponent,
|
||||||
@@ -293,6 +294,7 @@ const DECLARATIONS = [
|
|||||||
SystemWideAlertModule,
|
SystemWideAlertModule,
|
||||||
NgxGalleryModule,
|
NgxGalleryModule,
|
||||||
FormModule,
|
FormModule,
|
||||||
|
RequestCopyModule,
|
||||||
],
|
],
|
||||||
declarations: DECLARATIONS,
|
declarations: DECLARATIONS,
|
||||||
exports: [
|
exports: [
|
||||||
|
Reference in New Issue
Block a user