hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 21:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-4058] 'colspan' removed from table header; code cleanup

Browse Source
This commit is contained in:
Davide Negretti
2021-09-02 16:05:22 +02:00
parent 4b3e0e8d09
commit d66cf881fb
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/access-control/group-registry/group-form/group-form.component.spec.ts
View File

@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { BrowserModule, By } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

6
src/app/access-control/group-registry/group-form/group-form.component.ts
View File

@@ -189,7 +189,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
}); });
this.formModel = [ this.formModel = [
this.groupName, this.groupName,
// this.groupCommunity,
this.groupDescription, this.groupDescription,
]; ];
this.formGroup = this.formBuilderService.createFormGroup(this.formModel); this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
@@ -205,11 +204,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
this.groupBeingEdited = activeGroup; this.groupBeingEdited = activeGroup;
if (linkedObject?.name) { if (linkedObject?.name) {
// this.formModel = [
// this.groupName,
// this.groupCommunity,
// this.groupDescription,
// ];
this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity); this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
this.formGroup.patchValue({ this.formGroup.patchValue({
groupName: activeGroup != null ? activeGroup.name : '', groupName: activeGroup != null ? activeGroup.name : '',

3
src/app/access-control/group-registry/groups-registry.component.html
View File

@@ -47,7 +47,8 @@
<thead> <thead>
<tr> <tr>
<th scope="col">{{messagePrefix + 'table.id' | translate}}</th> <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
<th scope="col" colspan="2">{{messagePrefix + 'table.name' | translate}}</th> <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
<th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
<th scope="col">{{messagePrefix + 'table.members' | translate}}</th> <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
<th>{{messagePrefix + 'table.edit' | translate}}</th> <th>{{messagePrefix + 'table.edit' | translate}}</th>
</tr> </tr>

1
src/app/access-control/group-registry/groups-registry.component.spec.ts
View File

@@ -149,7 +149,6 @@ describe('GroupRegistryComponent', () => {
}; };
dsoDataServiceStub = { dsoDataServiceStub = {
findByHref(href: string): Observable<RemoteData<DSpaceObject>> { findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
console.warn(href);
return createSuccessfulRemoteDataObject$(undefined); return createSuccessfulRemoteDataObject$(undefined);
} }
}; };

2
src/assets/i18n/en.json5
View File

@@ -322,6 +322,8 @@
"admin.access-control.groups.table.name": "Name", "admin.access-control.groups.table.name": "Name",
"admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
"admin.access-control.groups.table.members": "Members", "admin.access-control.groups.table.members": "Members",
"admin.access-control.groups.table.edit": "Edit", "admin.access-control.groups.table.edit": "Edit",