Author: annis
Date: 2010-04-28 17:50:37 +0200 (Wed, 28 Apr 2010)
New Revision: 29302
Modified:
plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/lib/form/ahBaseFormDoctrine.class.php
plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/package.xml
Log:
Merge branch 'master' into HEAD
Modified:
plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/lib/form/ahBaseFormDoctrine.class.php
===================================================================
---
plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/lib/form/ahBaseFormDoctrine.class.php
2010-04-28 15:29:52 UTC (rev 29301)
+++
plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/lib/form/ahBaseFormDoctrine.class.php
2010-04-28 15:50:37 UTC (rev 29302)
@@ -256,13 +256,10 @@
*/
$relationName = $this->getRelationByEmbeddedFormClass($form);
-
//sfContext::getInstance()->getLogger()->info(print_r($this->scheduledForDeletion,
true));
- //sfContext::getInstance()->getLogger()->info($relationName);
-
if (!$relationName ||
!isset($this->scheduledForDeletion[$relationName]) || ($relationName &&
!array_key_exists($form->getObject()->getId(),
array_flip($this->scheduledForDeletion[$relationName]))))
{
- $form->saveEmbeddedForms($con);
$form->getObject()->save($con);
+ $form->saveEmbeddedForms($con);
}
}
else
Modified: plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/package.xml
===================================================================
--- plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/package.xml
2010-04-28 15:29:52 UTC (rev 29301)
+++ plugins/ahDoctrineEasyEmbeddedRelationsPlugin/trunk/package.xml
2010-04-28 15:50:37 UTC (rev 29302)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-04-27</date>
+ <date>2010-04-28</date>
<version>
- <release>1.3.0</release>
+ <release>1.3.1</release>
<api>1.0.0</api>
</version>
<stability>
@@ -183,5 +183,22 @@
Thank you koto!
</notes>
</release>
+ <release>
+ <version>
+ <release>1.3.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2010-04-28</date>
+ <license>MIT</license>
+ <notes>
+ Bugfix: Embedded i18n forms could not be saved; thanks for the bug
info to Sári Márton!
+ Trivial: removed some debug logger calls (they were commented out
anyway)
+ </notes>
+ </release>
</changelog>
</package>
--
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.
