Skip to content

Commit d471980

Browse files
committed
Added notes search to licenses
1 parent 89f7f50 commit d471980

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

app/controllers/admin/LicensesController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,9 +909,12 @@ public function getDatatable() {
909909
->addColumn('purchase_date', function($licenses) {
910910
return $licenses->purchase_date;
911911
})
912+
->addColumn('notes', function($licenses) {
913+
return $licenses->notes;
914+
})
912915
->addColumn($actions)
913-
->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions')
914-
->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions')
916+
->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
917+
->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
915918
->make();
916919
}
917920

app/views/backend/licenses/index.blade.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818

1919
<div class="row form-wrapper">
2020
{{ Datatable::table()
21-
->addColumn(Lang::get('admin/licenses/table.title'),
22-
Lang::get('admin/licenses/table.serial'),
23-
Lang::get('admin/licenses/form.seats'),
24-
Lang::get('admin/licenses/form.remaining_seats'),
25-
Lang::get('admin/licenses/table.purchase_date'),
21+
->addColumn(Lang::get('admin/licenses/table.title'),
22+
Lang::get('admin/licenses/table.serial'),
23+
Lang::get('admin/licenses/form.seats'),
24+
Lang::get('admin/licenses/form.remaining_seats'),
25+
Lang::get('admin/licenses/table.purchase_date'),
26+
Lang::get('admin/licenses/form.notes'),
2627
Lang::get('table.actions'))
2728
->setOptions(
2829
array(
@@ -31,7 +32,7 @@
3132
'lengthMenu' => Lang::get('general.page_menu'),
3233
'loadingRecords' => Lang::get('general.loading'),
3334
'zeroRecords' => Lang::get('general.no_results'),
34-
'info' => Lang::get('general.pagination_info'),
35+
'info' => Lang::get('general.pagination_info'),
3536
'processing' => Lang::get('general.processing'),
3637
'paginate'=> array(
3738
'first'=>Lang::get('general.first'),
@@ -42,10 +43,10 @@
4243
),
4344
'sAjaxSource'=>route('api.licenses.list'),
4445
'dom' =>'CT<"clear">lfrtip',
45-
'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(5),'activate'=>'mouseover'),
46+
'colVis'=> array('showAll'=>'Show All','restore'=>'Restore','exclude'=>array(6),'activate'=>'mouseover'),
4647
'columnDefs'=> array(
47-
array('bSortable'=>false,'targets'=>array(5)),
48-
array('width'=>'20%','targets'=>array(5)),
48+
array('bSortable'=>false,'targets'=>array(6)),
49+
array('width'=>'20%','targets'=>array(6)),
4950
),
5051
'order'=>array(array(0,'asc')),
5152
)

0 commit comments

Comments
 (0)