Author: Kris.Wallsmith
Date: 2010-05-21 16:49:47 +0200 (Fri, 21 May 2010)
New Revision: 29570
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
Log:
[1.3, 1.4] fixed doctrine form filter m2m query logic
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
===================================================================
---
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
2010-05-21 14:45:09 UTC (rev 29569)
+++
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
2010-05-21 14:49:47 UTC (rev 29570)
@@ -40,8 +40,10 @@
return;
}
- $query->leftJoin('r.<?php echo $relation['refTable']->getOption('name') ?>
<?php echo $relation['refTable']->getOption('name') ?>')
- ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values);
+ $query
+ ->leftJoin($query->getRootAlias().'.<?php echo
$relation['refTable']->getOption('name') ?> <?php echo
$relation['refTable']->getOption('name') ?>')
+ ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values)
+ ;
}
<?php endforeach; ?>
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
===================================================================
---
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
2010-05-21 14:45:09 UTC (rev 29569)
+++
branches/1.3/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
2010-05-21 14:49:47 UTC (rev 29570)
@@ -54,8 +54,10 @@
return;
}
- $query->leftJoin('r.<?php echo $relation['refTable']->getOption('name') ?>
<?php echo $relation['refTable']->getOption('name') ?>')
- ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values);
+ $query
+ ->leftJoin($query->getRootAlias().'.<?php echo
$relation['refTable']->getOption('name') ?> <?php echo
$relation['refTable']->getOption('name') ?>')
+ ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values)
+ ;
}
<?php endforeach; ?>
Modified:
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
===================================================================
---
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
2010-05-21 14:45:09 UTC (rev 29569)
+++
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
2010-05-21 14:49:47 UTC (rev 29570)
@@ -40,8 +40,10 @@
return;
}
- $query->leftJoin('r.<?php echo $relation['refTable']->getOption('name') ?>
<?php echo $relation['refTable']->getOption('name') ?>')
- ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values);
+ $query
+ ->leftJoin($query->getRootAlias().'.<?php echo
$relation['refTable']->getOption('name') ?> <?php echo
$relation['refTable']->getOption('name') ?>')
+ ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values)
+ ;
}
<?php endforeach; ?>
Modified:
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
===================================================================
---
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
2010-05-21 14:45:09 UTC (rev 29569)
+++
branches/1.4/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
2010-05-21 14:49:47 UTC (rev 29570)
@@ -54,8 +54,10 @@
return;
}
- $query->leftJoin('r.<?php echo $relation['refTable']->getOption('name') ?>
<?php echo $relation['refTable']->getOption('name') ?>')
- ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values);
+ $query
+ ->leftJoin($query->getRootAlias().'.<?php echo
$relation['refTable']->getOption('name') ?> <?php echo
$relation['refTable']->getOption('name') ?>')
+ ->andWhereIn('<?php echo $relation['refTable']->getOption('name')
?>.<?php echo $relation->getForeignFieldName() ?>', $values)
+ ;
}
<?php endforeach; ?>
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
