From 31917a339c852e8ad07703bf4413cc8a9607ee83 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 5 Oct 2015 04:40:16 +0200 Subject: [PATCH] Fixed little bug in padmin and SelectModelForm --- bin/padmin | 2 +- src/Forms/SelectModelForm.php | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bin/padmin b/bin/padmin index 10aaca0..6e1fb22 100755 --- a/bin/padmin +++ b/bin/padmin @@ -353,7 +353,7 @@ function update_table() $table_related=Webmodel::$model[$key]->components[$new_field]->related_model->name; - $id_table_related=Webmodel::load_id_model_related(Webmodel::$model[$key]->components[$new_field], $model); + $id_table_related=Webmodel::load_id_model_related(Webmodel::$model[$key]->components[$new_field], Webmodel::$model); Webmodel::$arr_sql_set_index[$key][$new_field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$new_field.'_'.$key.'IDX` FOREIGN KEY ( `'.$new_field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;'; diff --git a/src/Forms/SelectModelForm.php b/src/Forms/SelectModelForm.php index 6218f17..3ee406a 100644 --- a/src/Forms/SelectModelForm.php +++ b/src/Forms/SelectModelForm.php @@ -23,15 +23,24 @@ class SelectModelForm extends SelectForm{ public function form() { - - $model->set_conditions($this->conditions); - - $query=$model->select(array($this->field_name, $this->field_value), $this->raw_query); - - while($row=$model->fetch_array($query)) + + if($this->field_value=='' || $this->field_name=='') { - $this->arr_selected[$row[$this->field_value]]=$this->field_name; + throw new \Exception('Need field_value and field_name property'); + + } + + + $this->model->set_conditions($this->conditions); + + $query=$this->model->select(array($this->field_name, $this->field_value), $this->raw_query); + + while($row=$this->model->fetch_array($query)) + { + + $this->arr_select[$row[$this->field_value]]=$row[$this->field_name]; + }