Author: sevein
Date: Fri Sep 16 21:31:42 2011
New Revision: 9750
Log:
Commit model changes in plugins, see r9748
Modified:
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php
trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Fri Sep 16
21:30:13 2011 (r9749)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Fri Sep 16
21:31:42 2011 (r9750)
@@ -586,7 +586,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -623,7 +630,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Fri Sep 16
21:30:13 2011 (r9749)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Fri Sep 16
21:31:42 2011 (r9750)
@@ -376,7 +376,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -411,7 +418,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Fri Sep
16 21:30:13 2011 (r9749)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Fri Sep
16 21:31:42 2011 (r9750)
@@ -387,7 +387,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -422,7 +429,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Fri Sep 16
21:30:13 2011 (r9749)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Fri Sep 16
21:31:42 2011 (r9750)
@@ -373,7 +373,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -408,7 +415,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Fri Sep
16 21:30:13 2011 (r9749)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseAccessionI18n.php Fri Sep
16 21:31:42 2011 (r9750)
@@ -388,7 +388,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -423,7 +430,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Fri Sep 16 21:30:13 2011 (r9749)
+++ trunk/plugins/qtAccessionPlugin/lib/model/om/BaseDeaccessionI18n.php
Fri Sep 16 21:31:42 2011 (r9750)
@@ -378,7 +378,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -413,7 +420,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
--
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.
