resolve conflicts

This commit is contained in:
1Day 2021-12-14 16:05:27 +01:00
parent 720622ae02
commit 82ce13fcbd

View file

@ -55,8 +55,7 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody></tbody>
</tbody>
</table> </table>
</div> </div>
@ -73,35 +72,36 @@
function submitResult() { function submitResult() {
return confirm("{{__('Are you sure you wish to delete?')}}") !== false; return confirm("{{__('Are you sure you wish to delete?')}}") !== false;
} }
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
$('#datatable').DataTable({ $("#datatable").DataTable({
language: { language: {
url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json' url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json'
}, },
processing: true, processing: true,
serverSide: true, serverSide: true,
stateSave: true, stateSave: true,
order: [[ 2, "asc" ]], order: [
[ 2, "asc" ]
],
ajax: "{{ route('admin.products.datatable') }}", ajax: "{{ route('admin.products.datatable') }}",
columns: [ columns: [
{data: 'disabled'}, {data: "disabled"},
{data: 'name'}, {data: "name"},
{data: 'price'}, {data: "price"},
{data: 'memory'}, {data: "memory"},
{data: 'cpu'}, {data: "cpu"},
{data: 'swap'}, {data: "swap"},
{data: 'disk'}, {data: "disk"},
{data: 'databases'}, {data: "databases"},
{data: 'backups'}, {data: "backups"},
{data: 'nodes', sortable: false}, {data: "nodes", sortable: false},
{data: 'eggs', sortable: false}, {data: "eggs", sortable: false},
{data: 'servers', sortable: false}, {data: "servers", sortable: false},
{data: 'created_at'}, {data: "created_at"},
{data: 'actions', sortable: false}, {data: "actions", sortable: false}
], ],
fnDrawCallback: function (oSettings) { fnDrawCallback: function (oSettings) {
$('[data-toggle="popover"]').popover(); $("[data-toggle=\"popover\"]").popover();
} }
}); });
}); });