diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php index 380653b..827ed39 100644 --- a/app/Http/Controllers/AdminPaginationController.php +++ b/app/Http/Controllers/AdminPaginationController.php @@ -123,12 +123,6 @@ class AdminPaginationController extends Controller { '; } - public function renderControlLinkCell($link){ - return '
- ' . $this->renderToggleLinkActiveCell($link) . $this->renderDeleteLinkCell($link) . ' -
'; - } - /* DataTables bindings */ public function paginateAdminUsers(Request $request) { @@ -149,7 +143,8 @@ class AdminPaginationController extends Controller { $admin_links = Link::select(['short_url', 'long_url', 'clicks', 'created_at', 'creator', 'is_disabled']); return Datatables::of($admin_links) - ->addColumn('control', [$this, 'renderControlLinkCell']) + ->addColumn('disable', [$this, 'renderToggleLinkActiveCell']) + ->addColumn('delete', [$this, 'renderDeleteLinkCell']) ->editColumn('clicks', [$this, 'renderClicksCell']) ->editColumn('long_url', [$this, 'renderLongUrlCell']) ->escapeColumns(['short_url', 'creator']) diff --git a/public/js/AdminCtrl.js b/public/js/AdminCtrl.js index ddfd928..4f0b90c 100644 --- a/public/js/AdminCtrl.js +++ b/public/js/AdminCtrl.js @@ -152,12 +152,15 @@ polr.controller('AdminCtrl', function($scope, $compile, $timeout) { "ajax": BASE_API_PATH + 'admin/get_admin_links', "columns": [ - {className: 'wrap-text', data: 'short_url', name: 'short_url', width: '10%'}, + {className: 'wrap-text', data: 'short_url', name: 'short_url'}, {className: 'wrap-text', data: 'long_url', name: 'long_url'}, - {data: 'clicks', name: 'clicks', width: '10%'}, - {data: 'created_at', name: 'created_at', width: '18%'}, - {data: 'creator', name: 'creator', width: '20%'}, - {data: 'control', name: 'control', orderable: false, searchable: false, width: '15%'}, + {data: 'clicks', name: 'clicks'}, + {data: 'created_at', name: 'created_at'}, + {data: 'creator', name: 'creator'}, + + {data: 'disable', name: 'disable', orderable: false, searchable: false}, + {data: 'delete', name: 'delete', orderable: false, searchable: false} + ] }, datatables_config)); } diff --git a/resources/views/snippets/link_table.blade.php b/resources/views/snippets/link_table.blade.php index a8a2e5a..554d9a2 100644 --- a/resources/views/snippets/link_table.blade.php +++ b/resources/views/snippets/link_table.blade.php @@ -8,7 +8,8 @@ @if ($table_id == "admin_links_table") {{-- Show action buttons only if admin view --}} Creator - Control + Disable + Delete @endif