Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
dcd586e3cd
1 changed files with 2 additions and 2 deletions
|
@ -1064,7 +1064,7 @@
|
||||||
|
|
||||||
<div class="tab-pane" id="managed-users">
|
<div class="tab-pane" id="managed-users">
|
||||||
|
|
||||||
@include('partials.locations-bulk-actions')
|
@include('partials.users-bulk-actions')
|
||||||
|
|
||||||
|
|
||||||
<table
|
<table
|
||||||
|
@ -1074,7 +1074,7 @@
|
||||||
data-pagination="true"
|
data-pagination="true"
|
||||||
data-id-table="managedUsersTable"
|
data-id-table="managedUsersTable"
|
||||||
data-toolbar="#usersBulkEditToolbar"
|
data-toolbar="#usersBulkEditToolbar"
|
||||||
data-bulk-button-id="#bulkUsersEditButton"
|
data-bulk-button-id="#bulkUserEditButton"
|
||||||
data-bulk-form-id="#usersBulkForm"
|
data-bulk-form-id="#usersBulkForm"
|
||||||
data-search="true"
|
data-search="true"
|
||||||
data-show-footer="true"
|
data-show-footer="true"
|
||||||
|
|
Loading…
Add table
Reference in a new issue