Compare commits

..

No commits in common. "a59f96cdad81153c10b42ee075d3f835f6a2de59" and "59e9c77e4932de63934bb79d89c5600d37cda1c0" have entirely different histories.

4 changed files with 6 additions and 9 deletions

View File

@ -161,8 +161,8 @@ export class EditCommunityComponent {
communityId: this.fb.control(this.community.communityId), communityId: this.fb.control(this.community.communityId),
name: this.fb.control(this.community.title, Validators.required), name: this.fb.control(this.community.title, Validators.required),
shortName: this.fb.control(this.community.shortTitle, Validators.required), shortName: this.fb.control(this.community.shortTitle, Validators.required),
displayName: this.fb.control(this.community.displayTitle, Validators.required), displayName: this.fb.control(this.community.title, Validators.required),
displayShortName: this.fb.control(this.community.displayShortTitle, Validators.required), displayShortName: this.fb.control(this.community.shortTitle, Validators.required),
description: this.fb.control(this.community.description), description: this.fb.control(this.community.description),
status: this.fb.control(this.community.status), status: this.fb.control(this.community.status),
claim: this.fb.control(this.community.claim), claim: this.fb.control(this.community.claim),

View File

@ -35,7 +35,6 @@ import {UntypedFormBuilder} from "@angular/forms";
<fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();" <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();"
[okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)"> [okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)">
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<div *ngIf="dataProvider" class="uk-text-large">{{dataProvider.officialname}}</div>
<div class="uk-flex uk-flex-center"> <div class="uk-flex uk-flex-center">
<div> <div>
<mat-slide-toggle [checked]="enabled" (change)="enabled = !enabled; depositInfoChanged = true;"></mat-slide-toggle> <mat-slide-toggle [checked]="enabled" (change)="enabled = !enabled; depositInfoChanged = true;"></mat-slide-toggle>
@ -46,7 +45,7 @@ import {UntypedFormBuilder} from "@angular/forms";
<label class="uk-margin-medium-top uk-margin-small-left ">Suggest for deposit</label> <label class="uk-margin-medium-top uk-margin-small-left ">Suggest for deposit</label>
</div> </div>
</div> </div>
<div class="uk-hr" [class.uk-hidden]="!enabled"> <div *ngIf="enabled" class="uk-hr">
<div class="uk-text-center uk-text-bold uk-text-large uk-margin-top ">Content filters</div> <div class="uk-text-center uk-text-bold uk-text-large uk-margin-top ">Content filters</div>
<criteria #criteria *ngIf="dataProvider" [height]="'-1'" <criteria #criteria *ngIf="dataProvider" [height]="'-1'"
[selectionCriteria]="dataProvider.selectioncriteria"> [selectionCriteria]="dataProvider.selectioncriteria">
@ -154,7 +153,6 @@ export class ManageContentProvidersComponent implements OnInit {
this.dataProvider.deposit = this.deposit; this.dataProvider.deposit = this.deposit;
this.dataProvider.message = this.message; this.dataProvider.message = this.message;
this.dataProvider.enabled = this.enabled; this.dataProvider.enabled = this.enabled;
console.log(this.dataProvider)
this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => {
this.criteria.reset(); this.criteria.reset();
this.removeContentProvidersComponent.getCommunityContentProviders(); this.removeContentProvidersComponent.getCommunityContentProviders();
@ -166,7 +164,6 @@ export class ManageContentProvidersComponent implements OnInit {
}); });
} }
this.removeContentProvidersComponent.loading = true; this.removeContentProvidersComponent.loading = true;
console.log()
this.criteria.save(callback); this.criteria.save(callback);
} }

View File

@ -38,7 +38,7 @@
<a (click)="removeCommunity(item, true)" <a (click)="removeCommunity(item, true)"
class="uk-button uk-button-link uk-flex uk-flex-middle"> class="uk-button uk-button-link uk-flex uk-flex-middle">
<icon name="remove" [flex]="true"></icon> <icon name="remove" [flex]="true"></icon>
<span class="uk-margin-small-left">Remove as Main</span> <span class="uk-margin-small-left">Remove as master</span>
</a> </a>
</div> </div>
</div> </div>

View File

@ -61,7 +61,7 @@
<a (click)="removeFromMasterCommunity(item)" <a (click)="removeFromMasterCommunity(item)"
class="uk-button uk-button-link uk-flex uk-flex-middle"> class="uk-button uk-button-link uk-flex uk-flex-middle">
<icon name="remove" [flex]="true"></icon> <icon name="remove" [flex]="true"></icon>
<span class="uk-margin-small-left">Remove as Main</span> <span class="uk-margin-small-left">Remove as master</span>
</a> </a>
</div> </div>
</div> </div>
@ -70,7 +70,7 @@
<a (click)="addAsMasterCommunity(item)" <a (click)="addAsMasterCommunity(item)"
class="uk-button uk-button-link uk-flex uk-flex-middle"> class="uk-button uk-button-link uk-flex uk-flex-middle">
<icon name="add" [flex]="true"></icon> <icon name="add" [flex]="true"></icon>
<span class="uk-margin-small-left">Add as Main</span> <span class="uk-margin-small-left">Add as master</span>
</a> </a>
</div> </div>
</div> </div>