Skip to content

Commit cd2f8ab

Browse files
author
Jens Vannerum
committed
117544: fix issues latest 7.x merge
1 parent ea715ba commit cd2f8ab

3 files changed

Lines changed: 0 additions & 48 deletions

File tree

src/app/admin/admin-reports/filtered-items/filtered-items.component.html

Whitespace-only changes.

src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ describe('CollectionSourceControlsComponent', () => {
191191
const buttons = fixture.debugElement.queryAll(By.css('button'));
192192

193193
buttons.forEach(button => {
194-
console.log(button.nativeElement);
195194
expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
196195
expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
197196
});

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,6 @@
66
<textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation" [(ngModel)]="mdValue.newValue.value"
77
[attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
88
[dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
9-
<ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
10-
[bindId]="mdField"
11-
[group]="group"
12-
[model]="getModel()"
13-
(change)="onChangeAuthorityField($event)">
14-
</ds-dynamic-scrollable-dropdown>
15-
<ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
16-
[group]="group"
17-
[model]="getModel()"
18-
(change)="onChangeAuthorityField($event)">
19-
</ds-dynamic-onebox>
20-
<div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
21-
<span class="badge badge-light border" >
22-
<i dsAuthorityConfidenceState
23-
class="fas fa-fw p-0"
24-
aria-hidden="true"
25-
[authorityValue]="mdValue.newValue"
26-
[iconMode]="true"
27-
></i>
28-
{{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
29-
</span>
30-
</div>
31-
<div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
32-
<div class="btn-group w-75">
33-
<i dsAuthorityConfidenceState
34-
class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
35-
aria-hidden="true"
36-
[authorityValue]="mdValue.newValue.confidence"
37-
[iconMode]="true"
38-
></i>
39-
<input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
40-
[attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
41-
(change)="onChangeAuthorityKey()" />
42-
<button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
43-
[title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
44-
ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
45-
(click)="onChangeEditingAuthorityStatus(true)">
46-
<i class="fas fa-lock fa-fw"></i>
47-
</button>
48-
<button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
49-
[title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
50-
ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
51-
(click)="onChangeEditingAuthorityStatus(false)">
52-
<i class="fas fa-lock-open fa-fw"></i>
53-
</button>
54-
</div>
55-
</div>
569
<div class="d-flex" *ngIf="mdRepresentation">
5710
<a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
5811
<ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>

0 commit comments

Comments
 (0)