From 0e0bebf58c94257fc33bfc4a54258e1cfa04c67f Mon Sep 17 00:00:00 2001 From: mechtelm <nicht@mehr.fragen> Date: Fri, 20 Mar 2020 15:25:12 +0100 Subject: [PATCH] minor bugs fixed; iqb-berlin/testcenter-iqb-ng#83 iqb-berlin/testcenter-iqb-ng#89 iqb-berlin/testcenter-iqb-ng#82 iqb-berlin/testcenter-iqb-ng#84 --- src/app/superadmin/workspaces/workspaces.component.html | 4 +--- src/app/superadmin/workspaces/workspaces.component.ts | 6 +++--- src/environments/environment.ts | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/superadmin/workspaces/workspaces.component.html b/src/app/superadmin/workspaces/workspaces.component.html index 05a42a79..2aaf1543 100644 --- a/src/app/superadmin/workspaces/workspaces.component.html +++ b/src/app/superadmin/workspaces/workspaces.component.html @@ -63,14 +63,12 @@ <mat-table [dataSource]="UserlistDatasource" matSort> <ng-container matColumnDef="selectCheckbox"> - <mat-header-cell *matHeaderCellDef mat-sort-header>RO | RW | MO</mat-header-cell> + <mat-header-cell *matHeaderCellDef mat-sort-header>RO | RW</mat-header-cell> <mat-cell *matCellDef="let row" fxFlex="100px"> <mat-checkbox (change)="selectUser(row, 'RO')" [checked]="row.role === 'RO'" matTooltip="RO"> </mat-checkbox> <mat-checkbox (change)="selectUser(row, 'RW')" [checked]="row.role === 'RW'" matTooltip="RW"> </mat-checkbox> - <mat-checkbox (change)="selectUser(row, 'MO')" [checked]="row.role === 'MO'" matTooltip="MO"> - </mat-checkbox> </mat-cell> </ng-container> diff --git a/src/app/superadmin/workspaces/workspaces.component.ts b/src/app/superadmin/workspaces/workspaces.component.ts index 44942c20..45b823bb 100644 --- a/src/app/superadmin/workspaces/workspaces.component.ts +++ b/src/app/superadmin/workspaces/workspaces.component.ts @@ -125,7 +125,7 @@ export class WorkspacesComponent implements OnInit, OnDestroy { this.bs.renameWorkspace(selectedRows[0].id, (<FormGroup>result).get('name').value).subscribe( respOk => { - if (respOk) { + if (respOk !== false) { this.snackBar.open('Arbeitsbereich geändert', '', {duration: 1000}); this.updateObjectList(); } else { @@ -178,7 +178,7 @@ export class WorkspacesComponent implements OnInit, OnDestroy { selectedRows.forEach((r: IdAndName) => workspacesToDelete.push(r.id)); this.bs.deleteWorkspaces(workspacesToDelete).subscribe( respOk => { - if (respOk) { + if (respOk !== false) { this.snackBar.open('Arbeitsbereich/e gelöscht', '', {duration: 1000}); this.updateObjectList(); this.dataLoading = false; @@ -221,7 +221,7 @@ export class WorkspacesComponent implements OnInit, OnDestroy { this.dataLoading = true; this.bs.setUsersByWorkspace(this.selectedWorkspaceId, this.UserlistDatasource.data).subscribe( respOk => { - if (respOk) { + if (respOk !== false) { this.snackBar.open('Zugriffsrechte geändert', '', {duration: 1000}); } else { this.snackBar.open('Konnte Zugriffsrechte nicht ändern', 'Fehler', {duration: 2000}); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2198cb55..1c41f17b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,9 +4,9 @@ export const environment = { production: false, - testcenterUrl: 'https://ocba.iqb.hu-berlin.de/api/', + // testcenterUrl: 'https://ocba.iqb.hu-berlin.de/api/', // testcenterUrl: 'https://www.iqb-testcenter.de/', - // testcenterUrl: 'http://localhost/2020/testcenter-iqb-php/', + testcenterUrl: 'http://localhost/api/', appName: 'IQB-Testcenter', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', appVersion: '0 (dev)' -- GitLab