Skip to content

Commit 2f8e5fd

Browse files
committed
Small changes in order to start having shared theme with Codeigniter 4
1 parent 9c8ba08 commit 2f8e5fd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

application/config/grocery_crud.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
$config['grocery_crud_default_per_page'] = 10;
1010

1111
$config['grocery_crud_file_upload_allow_file_types'] = 'gif|jpeg|jpg|png|tiff|doc|docx|txt|odt|xls|xlsx|pdf|ppt|pptx|pps|ppsx|mp3|m4a|ogg|wav|mp4|m4v|mov|wmv|flv|avi|mpg|ogv|3gp|3g2';
12-
$config['grocery_crud_file_upload_max_file_size'] = '20MB'; //ex. '10MB' (Mega Bytes), '1067KB' (Kilo Bytes), '5000B' (Bytes)
12+
$config['grocery_crud_file_upload_max_file_size'] = '20MB'; //eg. '10MB' (Mega Bytes), '1067KB' (Kilo Bytes), '5000B' (Bytes)
1313

1414
// You can choose 'ckeditor','tinymce' or 'markitup'
1515
$config['grocery_crud_default_text_editor'] = 'ckeditor';

application/libraries/Grocery_CRUD.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,6 +1661,8 @@ protected function showList($ajax = false, $state_info = null)
16611661
$data->unset_export = $this->unset_export;
16621662
$data->unset_print = $this->unset_print;
16631663

1664+
$data->jquery_js = grocery_CRUD::JQUERY;
1665+
16641666
$default_per_page = $this->config->default_per_page;
16651667
$data->paging_options = $this->config->paging_options;
16661668
$data->default_per_page = is_numeric($default_per_page) && $default_per_page >1 && in_array($default_per_page,$data->paging_options)? $default_per_page : 25;
@@ -1685,7 +1687,7 @@ protected function showList($ajax = false, $state_info = null)
16851687
$this->_add_js_vars(array('dialog_forms' => $this->config->dialog_forms));
16861688

16871689
$data->list_view = $this->_theme_view('list.php',$data,true);
1688-
$this->_theme_view('list_template.php',$data);
1690+
$this->_theme_view('list_template.php', $data);
16891691
}
16901692
else
16911693
{

0 commit comments

Comments
 (0)