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

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

View File

@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
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 { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { Store } from '@ngrx/store';

View File

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

View File

@@ -47,7 +47,8 @@
<thead>
<tr>
<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>{{messagePrefix + 'table.edit' | translate}}</th>
</tr>

View File

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

View File

@@ -322,6 +322,8 @@
"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.edit": "Edit",