Skip to content

Commit

Permalink
fix(table): custom action when action position: 'right'
Browse files Browse the repository at this point in the history
  • Loading branch information
tibing-old-email committed May 5, 2017
1 parent 71ccfda commit bc5f5b4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/ng2-smart-table/components/tbody/tbody.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
</td>

<td *ngIf="!row.isInEditing && grid.showActionColumn('right')" class="ng2-smart-actions">
<ng2-st-tbody-custom [grid]="grid" (custom)="custom.emit($event)" [row]="row" [source]="source"></ng2-st-tbody-custom>

<ng2-st-tbody-edit-delete [grid]="grid"
[deleteConfirm]="deleteConfirm"
[editConfirm]="editConfirm"
Expand All @@ -45,9 +47,9 @@
(editRowSelect)="editRowSelect.emit($event)">
</ng2-st-tbody-edit-delete>
</td>
</tr>
</tr>

<tr *ngIf="grid.getRows().length == 0">
<tr *ngIf="grid.getRows().length == 0">
<td [attr.colspan]="grid.getColumns().length + (grid.getSetting('actions.add') || grid.getSetting('actions.edit') || grid.getSetting('actions.delete'))">
{{ grid.getSetting('noDataMessage') }}
</td>
Expand Down

0 comments on commit bc5f5b4

Please sign in to comment.