Skip to content

Commit

Permalink
#413: Unexpected error when there are non english chars and a datetim…
Browse files Browse the repository at this point in the history
…e field as column
  • Loading branch information
scoumbourdis committed Jul 8, 2017
1 parent 6cfe55f commit 815b36d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 5 additions & 2 deletions application/libraries/Grocery_CRUD.php
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ public function set_model($model_name)

protected function set_ajax_list_queries($state_info = null)
{
$field_types = $this->get_field_types();

if(!empty($state_info->per_page))
{
if(empty($state_info->page) || !is_numeric($state_info->page) )
Expand Down Expand Up @@ -654,7 +656,8 @@ protected function set_ajax_list_queries($state_info = null)
{
//@todo have a where for the relation_n_n statement
}
else
elseif (isset($field_types[$column->field_name])
&& !in_array($field_types[$column->field_name]->type, array('date', 'datetime', 'timestamp')))
{
$this->or_like($column->field_name, $search_text);
}
Expand Down Expand Up @@ -2289,7 +2292,7 @@ protected function get_text_input($field_info,$value)
}
else
{
$input = "<textarea id='field-{$field_info->name}' name='{$field_info->name}'>$value</textarea>";
$input = "<textarea id='field-{$field_info->name}' name='{$field_info->name}' class='form-control'>$value</textarea>";
}
return $input;
}
Expand Down
1 change: 1 addition & 0 deletions change_log.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
v 1.5.9
- #413: Unexpected error when there are non english chars and a datetime field as column
- #406: Export button to work without the need of a popup window or new tab
- Clean-up redundant JavaScript load if it is not required.
- Remove Export as a flash plugin for security reasons and instead add a download link
Expand Down

0 comments on commit 815b36d

Please sign in to comment.