Author: mcantelon
Date: Fri Apr 13 15:30:28 2012
New Revision: 11442
Log:
added throwing of error when conflicting parent specification columns are used.
Modified:
trunk/lib/task/import/csvImportTask.class.php
Modified: trunk/lib/task/import/csvImportTask.class.php
==============================================================================
--- trunk/lib/task/import/csvImportTask.class.php Fri Apr 13 13:04:11
2012 (r11441)
+++ trunk/lib/task/import/csvImportTask.class.php Fri Apr 13 15:30:28
2012 (r11442)
@@ -354,6 +354,16 @@
if (
isset($self->rowStatusVars['qubitParentSlug'])
&& $self->rowStatusVars['qubitParentSlug']
+ && isset($self->rowStatusVars['parentId'])
+ && $self->rowStatusVars['parentId']
+ )
+ {
+ throw new sfException('Both parentId and qubitParentSlug are set:
only one should be set.');
+ }
+
+ if (
+ isset($self->rowStatusVars['qubitParentSlug'])
+ && $self->rowStatusVars['qubitParentSlug']
)
{
$query = "SELECT object_id FROM slug WHERE slug=?";
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" 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/qubit-commits?hl=en.
