phangoapp/phamodels
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed little bug in padmin and SelectModelForm

Browse source
This commit is contained in:
Antonio de la Rosa 2015-10-05 04:40:16 +02:00
parent 71081e21c8
commit 31917a339c
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/padmin
View file

@ -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;';

21
src/Forms/SelectModelForm.php
View file

@ -24,14 +24,23 @@ 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];
}