This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch audit
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/audit by this push:
new 3a9e635 Changed data type
3a9e635 is described below
commit 3a9e6357e178ed68d9bd619f23bc152ed80001c3
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Thu Jun 11 15:37:33 2020 +0300
Changed data type
---
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../audit/audit-grid/audit-grid.component.ts | 27 +++++++++++-----------
.../cluster-details/cluster-details.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.ts | 2 +-
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
index feb6f17..3d5872d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
@@ -81,7 +81,7 @@
<td mat-cell *matCellDef=" let element">
<div class="action-wrapper">
<span>{{element.action}}</span>
- <div class="audit-info" (click)="openActionInfo(element)"
*ngIf="element.info.length">
+ <div class="audit-info" (click)="openActionInfo(element)"
*ngIf="element.info">
<i class="material-icons">info</i>
</div>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index 7c40eaa..bf71876 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -103,19 +103,20 @@ export class AuditGridComponent implements OnInit {
<button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
<div mat-dialog-content class="content">
- <ul info-items-list *ngIf="data.data.length>1;else message">
- <li class="info-item">
- <span class="info-item-title">Group:</span>
- <span class="info-item-data"> {{data.data.name}}</span>
- </li>
- <li class="info-item">
- <span class="info-item-title">Users:</span>
- <span class="info-item-data">
- <span>{{data.data.objects}}</span>
- </span>
- </li>
- </ul>
- <ng-template #message>{{data.data[0]}}.</ng-template>
+<!-- <ul info-items-list *ngIf=" dattypeofa.data.length>1;else
message">-->
+<!-- <li class="info-item">-->
+<!-- <span class="info-item-title">Group:</span>-->
+<!-- <span class="info-item-data">
{{data.data.name}}</span>-->
+<!-- </li>-->
+<!-- <li class="info-item">-->
+<!-- <span class="info-item-title">Users:</span>-->
+<!-- <span class="info-item-data">-->
+<!-- <span>{{data.data.objects}}</span>-->
+<!-- </span>-->
+<!-- </li>-->
+<!-- </ul>-->
+<!-- <ng-template #message>{{data.data}}.</ng-template>-->
+ <p>{{data.data}}.</p>
<div class="text-center m-top-30 m-bott-10">
<!-- <button type="button" class="butt" mat-raised-button
(click)="dialogRef.close()">No</button>-->
<!-- <button type="button" class="butt butt-success"
mat-raised-button-->
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
index a70d784..13916bd 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
@@ -119,7 +119,7 @@ export class DetailComputationalResourcesComponent
implements OnInit {
}
private logAction(name: any, description: string) {
- this.auditService.sendDataToAudit({resource_name: name, info: [`User
followed ${description} link`]}).subscribe();
+ this.auditService.sendDataToAudit({resource_name: name, info: `User
followed ${description} link`}).subscribe();
console.log(`${name}: ${description}`);
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index 64759cb..cceae69 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -161,6 +161,6 @@ export class DetailDialogComponent implements OnInit {
}
private logAction(name: any, description: string) {
- this.auditService.sendDataToAudit({resource_name: name, info: [`User
followed ${description} link`]}).subscribe();
+ this.auditService.sendDataToAudit({resource_name: name, info: `User
followed ${description} link`}).subscribe();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
