Explorar el Código

Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/matsen-tool-fe

# Conflicts:
#	matsen-tool/src/app/_components/paging/paging.component.ts
master
Florian Eisenmenger hace 1 año
padre
commit
0e7ac0f9db
Se han modificado 2 ficheros con 1 adiciones y 2 borrados
  1. +1
    -1
      matsen-tool/src/app/_components/paging/paging.component.ts
  2. +0
    -1
      matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts

+ 1
- 1
matsen-tool/src/app/_components/paging/paging.component.ts Ver fichero

@@ -15,7 +15,7 @@ export class PagingComponent implements OnInit {
@Input() public pageSize!: number; @Input() public pageSize!: number;
@Input() public pageSizeOptions!: number[]; @Input() public pageSizeOptions!: number[];
@Input() public searchable: boolean; @Input() public searchable: boolean;
@ViewChild(MatPaginator) public paginator!: MatPaginator; @ViewChild(MatPaginator) public paginator!: MatPaginator;


private defaultPageSize: number = 10; private defaultPageSize: number = 10;


+ 0
- 1
matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts Ver fichero

@@ -38,7 +38,6 @@ export class AssignProductComponent implements OnInit {
if (this.partnerProduct !== undefined) { if (this.partnerProduct !== undefined) {
this.form = FormGroupInitializer.initFormGroup(partnerProductForm, this.partnerProduct); this.form = FormGroupInitializer.initFormGroup(partnerProductForm, this.partnerProduct);
} }
console.log(this.contactPartnerProduct);
if (this.contactPartnerProduct !== undefined) { if (this.contactPartnerProduct !== undefined) {
this.form = FormGroupInitializer.initFormGroup(contactPartnerProductForm, this.contactPartnerProduct); this.form = FormGroupInitializer.initFormGroup(contactPartnerProductForm, this.contactPartnerProduct);
} }


Cargando…
Cancelar
Guardar