Skip to content

Commit

Permalink
[front: editLog] superpose create / delete
Browse files Browse the repository at this point in the history
  • Loading branch information
t8g committed Sep 4, 2017
1 parent 8ea651b commit 1019a0d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 0 additions & 2 deletions client/src/app/log-table/log-table.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ table.bordered > tbody > tr.open2 td {
padding: 5px;
}
table.bordered > tbody > tr.open2 pre {
flex-grow: 1;
width:50%;
overflow:hidden;
margin: 0;
}
Expand Down
11 changes: 6 additions & 5 deletions client/src/app/log-table/log-table.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@

<td>{{ log.date | date:'yyyy-MM-dd HH:mm' }}</td>
<td>
<a [routerLink]="['/', feature, { outlets: { editor: log.item.id } }]" queryParamsHandling="preserve">{{ log.item.name }}</a>
<a *ngIf="log.action !== 'delete'" [routerLink]="['/', feature, { outlets: { editor: log.item.id } }]" queryParamsHandling="preserve">{{ log.item.name }}</a>
<span *ngIf="log.action === 'delete'">{{ log.item.name }}</span>
</td>
<td [class.bleft]="log._open">{{ 'editLogs.actions.' + log.action | translate }}</td>
<td class="labels" (click)="toggle(log, $event)">
Expand Down Expand Up @@ -121,10 +122,10 @@
<td [class.bleft]="log._open">{{ 'editLogs.actions.' + diff.editType | translate }}</td>
<td>{{ diff._label }}</td>
<td colspan="2">
<div style="display: flex">
<pre style="color:red;">{{ diff?.valueBefore | json }}</pre>
<pre style="color:green;">{{ diff?.valueAfter | json }}</pre>
</div>
<pre style="color:red;">{{ diff?.valueBefore | json }}</pre>
<pre style="color:green;">{{ diff?.valueAfter | json }}</pre>
<!-- <div style="display: flex">
</div> -->
</td>
</tr>
</ng-template>
Expand Down

0 comments on commit 1019a0d

Please sign in to comment.