Skip to content

Commit 9b27131

Browse files
committed
Fixing merge issue.
1 parent 0f30483 commit 9b27131

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-edit-modal/property-edit-modal.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ <h3 mat-dialog-title>{{ 'Edit property' | translate }}</h3>
3636
matInput
3737
type="text"
3838
formControlName="chr"
39-
(input)="onChrNumberChanged($event.target.value)"
4039
/>
4140
</mat-form-field>
4241

eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-edit-modal/property-edit-modal.component.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export class PropertyEditModalComponent implements OnInit, OnDestroy {
8181
// }
8282
// if (number === 1111111) {
8383
this.propertyIsFarm = true;
84-
this.selectedProperty.isFarm = true;
8584
// }
8685
// if (number > 1111111) {
8786
// if (number.toString().length > 7) {
@@ -137,15 +136,6 @@ export class PropertyEditModalComponent implements OnInit, OnDestroy {
137136
return language ? language.checked : false;
138137
}
139138

140-
get isDisabledSaveButton(): boolean {
141-
if (this.selectedProperty/* && this.selectedProperty.languagesIds*/) {
142-
return (
143-
!this.selectedProperty.name/* ||
144-
!this.selectedLanguages.some((x) => x.checked)*/
145-
);
146-
}
147-
}
148-
149139
onChrNumberChanged(number: number) {
150140
if (number > 11111 && number.toString().length > 5) {
151141
this.getChrInformationSub$ = this.propertiesService.getChrInformation(number).subscribe((data) => {

0 commit comments

Comments
 (0)