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

Fixes on Webmodel

Browse source
This commit is contained in:
Antonio de la Rosa 2015-08-28 13:51:50 +02:00
parent 890704010b
commit 52d75b8029
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Webmodel.php
View file

@ -1086,13 +1086,6 @@ class Webmodel {
$conditions=trim($this->conditions.' '.$this->order_by.' '.$this->limit); $conditions=trim($this->conditions.' '.$this->order_by.' '.$this->limit);
if($this->reset_conditions==1)
{
$this->reset_conditions();
}
foreach($this->components as $name_field => $component) foreach($this->components as $name_field => $component)
{ {
@ -1108,10 +1101,14 @@ class Webmodel {
//Delete rows on models with foreignkeyfields to this model... //Delete rows on models with foreignkeyfields to this model...
//You need load all models with relationship if you want delete related rows... //You need load all models with relationship if you want delete related rows...
$this->set_conditions($this->conditions);
$this->set_limit($this->limit);
if(count($this->related_models_delete)>0) if(count($this->related_models_delete)>0)
{ {
$arr_deleted=$this->select_to_array($conditions, array($this->idmodel), 1); $arr_deleted=$this->select_to_array(array($this->idmodel), 1);
$arr_id=array_keys($arr_deleted); $arr_id=array_keys($arr_deleted);
@ -1122,8 +1119,9 @@ class Webmodel {
if( isset( Webmodel::$model[ $arr_set_model['model'] ]->components[ $arr_set_model['related_field'] ] ) ) if( isset( Webmodel::$model[ $arr_set_model['model'] ]->components[ $arr_set_model['related_field'] ] ) )
{ {
$this->set_conditions('where '.$arr_set_model['related_field'].' IN ('.implode(', ', $arr_id).')');
Webmodel::$model[ $arr_set_model['model'] ]->delete('where '.$arr_set_model['related_field'].' IN ('.implode(', ', $arr_id).')'); Webmodel::$model[ $arr_set_model['model'] ]->delete();
} }
@ -1131,6 +1129,13 @@ class Webmodel {
} }
if($this->reset_conditions==1)
{
$this->reset_conditions();
}
return SQLClass::webtsys_query('delete from '.$this->name.' '.$conditions, $this->db_selected); return SQLClass::webtsys_query('delete from '.$this->name.' '.$conditions, $this->db_selected);
} }