Skip to content

Commit 5cf6ab2

Browse files
authored
Merge pull update with lasted oficial grocery-crud
* Replace isset with array_key_exists to check post_array * Replace the isset with property_exists to check rown database * translated some missing english in spanish
2 parents 90f64a4 + 9b311e3 commit 5cf6ab2

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

application/libraries/Grocery_CRUD.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ protected function db_update_validation()
858858
$this->basic_model->where($primary_key,$state_info->primary_key);
859859
$row = $this->basic_model->get_row();
860860

861-
if(!isset($row->$field_name)) {
861+
if(!property_exists($row, $field_name)) {
862862
throw new Exception("The field name doesn't exist in the database. ".
863863
"Please use the unique fields only for fields ".
864864
"that exist in the database");
@@ -955,7 +955,7 @@ protected function db_insert($state_info)
955955
$post_data[$field->field_name] = array();
956956
}
957957

958-
if(isset($post_data[$field->field_name]) && !isset($this->relation_n_n[$field->field_name]))
958+
if(array_key_exists($field->field_name, $post_data) && !isset($this->relation_n_n[$field->field_name]))
959959
{
960960
if(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && is_array($post_data[$field->field_name]) && empty($post_data[$field->field_name]))
961961
{
@@ -1080,7 +1080,7 @@ protected function db_update($state_info)
10801080
$post_data[$field->field_name] = array();
10811081
}
10821082

1083-
if(isset($post_data[$field->field_name]) && !isset($this->relation_n_n[$field->field_name]))
1083+
if(array_key_exists($field->field_name, $post_data) && !isset($this->relation_n_n[$field->field_name]))
10841084
{
10851085
if(isset($types[$field->field_name]->db_null) && $types[$field->field_name]->db_null && is_array($post_data[$field->field_name]) && empty($post_data[$field->field_name]))
10861086
{

assets/grocery_crud/languages/spanish.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@
8686
$lang['list_more'] = 'Mas';
8787

8888
/* Added in version 1.5.6 */
89-
$lang['list_search_column'] = 'Search {column_name}';
89+
$lang['list_search_column'] = 'Buscar por {column_name}';
9090

9191
/* Added in version 1.5.8 */
92-
$lang['alert_delete_multiple'] = 'Are you sure that you want to delete those {items_amount} items?';
92+
$lang['alert_delete_multiple'] = '¿Estás seguro que deseas eliminar esos {items_amount} elementos?';
9393

94-
$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
94+
$lang['alert_delete_multiple_one'] = '¿Estás seguro que deseas eliminar ese 1 elemento?';
9595

9696

9797

9898
/* Added in version 1.6.1 */
99-
$lang['list_clone'] = 'Clone';
99+
$lang['list_clone'] = 'Clonar';
100100

0 commit comments

Comments
 (0)