Author: jablko
Date: Thu Oct 21 20:29:49 2010
New Revision: 8357
Log:
Add date behavior
Added:
trunk/js/date.js (contents, props changed)
Modified:
trunk/apps/qubit/modules/informationobject/templates/_event.php
trunk/lib/model/om/BaseActor.php
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObject.php
trunk/lib/model/om/BaseInformationObjectI18n.php
trunk/lib/model/om/BaseMap.php
trunk/lib/model/om/BaseMapI18n.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BaseMenuI18n.php
trunk/lib/model/om/BaseNote.php
trunk/lib/model/om/BaseNoteI18n.php
trunk/lib/model/om/BaseOaiHarvest.php
trunk/lib/model/om/BaseOaiRepository.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
trunk/lib/model/om/BasePhysicalObject.php
trunk/lib/model/om/BasePhysicalObjectI18n.php
trunk/lib/model/om/BasePlaceI18n.php
trunk/lib/model/om/BaseProperty.php
trunk/lib/model/om/BasePropertyI18n.php
trunk/lib/model/om/BaseRepositoryI18n.php
trunk/lib/model/om/BaseRights.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseRightsTermRelation.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseSlug.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseSystemEvent.php
trunk/lib/model/om/BaseTaxonomy.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/model/om/BaseUser.php
trunk/lib/propel/builder/QubitObjectBuilder.php
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/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_event.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_event.php Thu Oct
21 20:20:45 2010 (r8356)
+++ trunk/apps/qubit/modules/informationobject/templates/_event.php Thu Oct
21 20:29:49 2010 (r8357)
@@ -2,6 +2,7 @@
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first');
+$sf_response->addJavaScript('date');
$sf_response->addJavaScript('/vendor/yui/datasource/datasource-min');
$sf_response->addJavaScript('/vendor/yui/container/container-min');
$sf_response->addJavaScript('dialog');
@@ -95,7 +96,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
-<table class="inline" id="updateEvent">
+<table class="date inline" id="updateEvent">
<caption>
<?php echo __('Event') ?>
</caption><tbody>
Added: trunk/js/date.js
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/js/date.js Thu Oct 21 20:29:49 2010 (r8357)
@@ -0,0 +1,69 @@
+// $Id$
+
+(function ($)
+ {
+ Drupal.behaviors.date = {
+ attach: function (context)
+ {
+ $('.date', context).each(function ()
+ {
+ var $dateStart = $('[id$=startDate]', this);
+ var $dateEnd = $('[id$=endDate]', this);
+
+ var min = '';
+ var max = '';
+
+ $('[id$=dateDisplay]', this).change(function ()
+ {
+ if (min === $dateStart.val() && max === $dateEnd.val())
+ {
+ min = max = [];
+
+ var matches =
$(this).val().match(/\d+(?:[-/]0*(?:1[0-2]|\d)(?:[-/]0*(?:3[01]|[12]?\d))?(?!\d))?/g);
+ if (matches)
+ {
+ jQuery.each(matches, function (index)
+ {
+ var matches = this.match(/\d+/g);
+ if (0 === index)
+ {
+ min = max = matches;
+
+ return;
+ }
+
+ jQuery.each(min, function (index)
+ {
+ if (this - 0 < matches[index] - 0)
+ {
+ return false;
+ }
+
+ if (this - 0 != matches[index] - 0)
+ {
+ min = matches;
+ }
+ });
+
+ jQuery.each(max, function (index)
+ {
+ if (this - 0 > matches[index] - 0)
+ {
+ return false;
+ }
+
+ if (this - 0 != matches[index] - 0)
+ {
+ max = matches;
+ }
+ });
+ });
+ }
+
+ $dateStart.val(min = min.join('-'));
+ $dateEnd.val(max = max.join('-'));
+ }
+ });
+ });
+ } };
+ })(jQuery);
Modified: trunk/lib/model/om/BaseActor.php
==============================================================================
--- trunk/lib/model/om/BaseActor.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseActor.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -408,7 +408,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseActorI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -397,7 +397,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BaseContactInformation.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -470,7 +470,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -379,7 +379,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseDigitalObject.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -258,7 +258,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseEventI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -377,7 +377,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseFunctionI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -391,7 +391,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseInformationObject.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObject.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BaseInformationObject.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -392,7 +392,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -413,7 +413,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseMap.php
==============================================================================
--- trunk/lib/model/om/BaseMap.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseMap.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -468,7 +468,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseMapI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMapI18n.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseMapI18n.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseMenu.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -545,7 +545,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseMenuI18n.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseNote.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -549,7 +549,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseNoteI18n.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -373,7 +373,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseOaiHarvest.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -384,7 +384,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseOaiRepository.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -402,7 +402,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseObject.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -181,11 +181,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- return true;
- }
-
if ('notes' == $name)
{
return true;
@@ -231,6 +226,11 @@
return true;
}
+ if ('aclPermissions' == $name)
+ {
+ return true;
+ }
+
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -272,23 +272,6 @@
}
}
- if ('aclPermissions' == $name)
- {
- if (!isset($this->refFkValues['aclPermissions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['aclPermissions'];
- }
-
if ('notes' == $name)
{
if (!isset($this->refFkValues['notes']))
@@ -442,6 +425,23 @@
return $this->refFkValues['statuss'];
}
+ if ('aclPermissions' == $name)
+ {
+ if (!isset($this->refFkValues['aclPermissions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['aclPermissions'];
+ }
+
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
@@ -596,7 +596,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
@@ -740,26 +740,6 @@
$this->setid($key);
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAclPermission::OBJECT_ID, $id);
-
- return $criteria;
- }
-
- public static function getaclPermissionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
-
- return QubitAclPermission::get($criteria, $options);
- }
-
- public function addaclPermissionsCriteria(Criteria $criteria)
- {
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
- }
-
public static function addnotesCriteriaById(Criteria $criteria, $id)
{
$criteria->add(QubitNote::OBJECT_ID, $id);
@@ -940,6 +920,26 @@
return self::addstatussCriteriaById($criteria, $this->id);
}
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAclPermission::OBJECT_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaclPermissionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaclPermissionsCriteriaById($criteria, $id);
+
+ return QubitAclPermission::get($criteria, $options);
+ }
+
+ public function addaclPermissionsCriteria(Criteria $criteria)
+ {
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ }
+
public function __call($name, $args)
{
if ('get' == substr($name, 0, 3) || 'set' == substr($name, 0, 3))
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseOtherName.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -450,7 +450,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BasePhysicalObject.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObject.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BasePhysicalObject.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -332,7 +332,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -377,7 +377,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BasePlaceI18n.php
==============================================================================
--- trunk/lib/model/om/BasePlaceI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BasePlaceI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -379,7 +379,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseProperty.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -452,7 +452,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BasePropertyI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -373,7 +373,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -401,7 +401,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseRights.php
==============================================================================
--- trunk/lib/model/om/BaseRights.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseRights.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -494,7 +494,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseRightsI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -373,7 +373,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseRightsTermRelation.php
==============================================================================
--- trunk/lib/model/om/BaseRightsTermRelation.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/model/om/BaseRightsTermRelation.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -380,7 +380,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseSetting.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -450,7 +450,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseSettingI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -373,7 +373,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseSlug.php
==============================================================================
--- trunk/lib/model/om/BaseSlug.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseSlug.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -372,7 +372,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseStatus.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -378,7 +378,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseSystemEvent.php
==============================================================================
--- trunk/lib/model/om/BaseSystemEvent.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseSystemEvent.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -386,7 +386,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseTaxonomy.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomy.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseTaxonomy.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -358,7 +358,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Thu Oct 21 20:20:45 2010
(r8356)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Thu Oct 21 20:29:49 2010
(r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseTerm.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -1038,7 +1038,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseTermI18n.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -373,7 +373,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/lib/model/om/BaseUser.php
==============================================================================
--- trunk/lib/model/om/BaseUser.php Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/lib/model/om/BaseUser.php Thu Oct 21 20:29:49 2010 (r8357)
@@ -82,22 +82,22 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
return true;
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
return true;
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
return true;
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
return true;
}
@@ -123,154 +123,154 @@
{
}
- if ('aclPermissions' == $name)
+ if ('notes' == $name)
{
- if (!isset($this->refFkValues['aclPermissions']))
+ if (!isset($this->refFkValues['notes']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclPermissions'] = QubitQuery::create();
+ $this->refFkValues['notes'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclPermissions'];
+ return $this->refFkValues['notes'];
}
- if ('aclUserGroups' == $name)
+ if ('systemEvents' == $name)
{
- if (!isset($this->refFkValues['aclUserGroups']))
+ if (!isset($this->refFkValues['systemEvents']))
{
if (!isset($this->id))
{
- $this->refFkValues['aclUserGroups'] = QubitQuery::create();
+ $this->refFkValues['systemEvents'] = QubitQuery::create();
}
else
{
- $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['aclUserGroups'];
+ return $this->refFkValues['systemEvents'];
}
- if ('notes' == $name)
+ if ('aclPermissions' == $name)
{
- if (!isset($this->refFkValues['notes']))
+ if (!isset($this->refFkValues['aclPermissions']))
{
if (!isset($this->id))
{
- $this->refFkValues['notes'] = QubitQuery::create();
+ $this->refFkValues['aclPermissions'] = QubitQuery::create();
}
else
{
- $this->refFkValues['notes'] = self::getnotesById($this->id,
array('self' => $this) + $options);
+ $this->refFkValues['aclPermissions'] =
self::getaclPermissionsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['notes'];
+ return $this->refFkValues['aclPermissions'];
}
- if ('systemEvents' == $name)
+ if ('aclUserGroups' == $name)
{
- if (!isset($this->refFkValues['systemEvents']))
+ if (!isset($this->refFkValues['aclUserGroups']))
{
if (!isset($this->id))
{
- $this->refFkValues['systemEvents'] = QubitQuery::create();
+ $this->refFkValues['aclUserGroups'] = QubitQuery::create();
}
else
{
- $this->refFkValues['systemEvents'] =
self::getsystemEventsById($this->id, array('self' => $this) + $options);
+ $this->refFkValues['aclUserGroups'] =
self::getaclUserGroupsById($this->id, array('self' => $this) + $options);
}
}
- return $this->refFkValues['systemEvents'];
+ return $this->refFkValues['aclUserGroups'];
}
throw new sfException("Unknown record property \"$name\" on
\"".get_class($this).'"');
}
- public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
+ public static function addnotesCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclPermission::USER_ID, $id);
+ $criteria->add(QubitNote::USER_ID, $id);
return $criteria;
}
- public static function getaclPermissionsById($id, array $options = array())
+ public static function getnotesById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclPermissionsCriteriaById($criteria, $id);
+ self::addnotesCriteriaById($criteria, $id);
- return QubitAclPermission::get($criteria, $options);
+ return QubitNote::get($criteria, $options);
}
- public function addaclPermissionsCriteria(Criteria $criteria)
+ public function addnotesCriteria(Criteria $criteria)
{
- return self::addaclPermissionsCriteriaById($criteria, $this->id);
+ return self::addnotesCriteriaById($criteria, $this->id);
}
- public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
+ public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitAclUserGroup::USER_ID, $id);
+ $criteria->add(QubitSystemEvent::USER_ID, $id);
return $criteria;
}
- public static function getaclUserGroupsById($id, array $options = array())
+ public static function getsystemEventsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addaclUserGroupsCriteriaById($criteria, $id);
+ self::addsystemEventsCriteriaById($criteria, $id);
- return QubitAclUserGroup::get($criteria, $options);
+ return QubitSystemEvent::get($criteria, $options);
}
- public function addaclUserGroupsCriteria(Criteria $criteria)
+ public function addsystemEventsCriteria(Criteria $criteria)
{
- return self::addaclUserGroupsCriteriaById($criteria, $this->id);
+ return self::addsystemEventsCriteriaById($criteria, $this->id);
}
- public static function addnotesCriteriaById(Criteria $criteria, $id)
+ public static function addaclPermissionsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitNote::USER_ID, $id);
+ $criteria->add(QubitAclPermission::USER_ID, $id);
return $criteria;
}
- public static function getnotesById($id, array $options = array())
+ public static function getaclPermissionsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addnotesCriteriaById($criteria, $id);
+ self::addaclPermissionsCriteriaById($criteria, $id);
- return QubitNote::get($criteria, $options);
+ return QubitAclPermission::get($criteria, $options);
}
- public function addnotesCriteria(Criteria $criteria)
+ public function addaclPermissionsCriteria(Criteria $criteria)
{
- return self::addnotesCriteriaById($criteria, $this->id);
+ return self::addaclPermissionsCriteriaById($criteria, $this->id);
}
- public static function addsystemEventsCriteriaById(Criteria $criteria, $id)
+ public static function addaclUserGroupsCriteriaById(Criteria $criteria, $id)
{
- $criteria->add(QubitSystemEvent::USER_ID, $id);
+ $criteria->add(QubitAclUserGroup::USER_ID, $id);
return $criteria;
}
- public static function getsystemEventsById($id, array $options = array())
+ public static function getaclUserGroupsById($id, array $options = array())
{
$criteria = new Criteria;
- self::addsystemEventsCriteriaById($criteria, $id);
+ self::addaclUserGroupsCriteriaById($criteria, $id);
- return QubitSystemEvent::get($criteria, $options);
+ return QubitAclUserGroup::get($criteria, $options);
}
- public function addsystemEventsCriteria(Criteria $criteria)
+ public function addaclUserGroupsCriteria(Criteria $criteria)
{
- return self::addsystemEventsCriteriaById($criteria, $this->id);
+ return self::addaclUserGroupsCriteriaById($criteria, $this->id);
}
}
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Thu Oct 21 20:20:45
2010 (r8356)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Thu Oct 21 20:29:49
2010 (r8357)
@@ -1416,7 +1416,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', \$value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', \$value))
{
\$value = new DateTime(\$value);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Oct 21
20:20:45 2010 (r8356)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Thu Oct 21
20:29:49 2010 (r8357)
@@ -585,7 +585,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Oct 21
20:20:45 2010 (r8356)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Thu Oct 21
20:29:49 2010 (r8357)
@@ -375,7 +375,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Oct
21 20:20:45 2010 (r8356)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Thu Oct
21 20:29:49 2010 (r8357)
@@ -386,7 +386,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Oct 21
20:20:45 2010 (r8356)
+++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Thu Oct 21
20:29:49 2010 (r8357)
@@ -372,7 +372,7 @@
// Convert to DateTime if not SQL zero special case: year plus
// separator plus zero to twelve (possibly zero padded) plus
// separator plus one or more zeros
- if (!preg_match('/^\d+[-\/]0*(?:\d|1[012])[-\/]0+$/', $value))
+ if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
$value = new DateTime($value);
}
Modified: trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,5 +1,6 @@
<?php
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first') ?>
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('/vendor/yui/datasource/datasource-min') ?>
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('dialog') ?>
@@ -129,7 +130,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
- <table class="inline" id="resourceRelation">
+ <table class="date inline" id="resourceRelation">
<tbody>
<tr>
<th colspan="3" style="width: 55%">
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 20:20:45 2010 (r8356)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,5 +1,6 @@
<?php
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first') ?>
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('/vendor/yui/datasource/datasource-min') ?>
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('dialog') ?>
@@ -166,7 +167,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
- <table class="inline" id="actorRelation">
+ <table class="date inline" id="actorRelation">
<caption>
<?php echo __('Related corporate body, person or family') ?>
</caption><tbody>
Modified: trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Thu Oct 21 20:20:45 2010 (r8356)
+++ trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,3 +1,4 @@
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('multiDelete') ?>
<div class="section">
@@ -25,7 +26,7 @@
<?php $form->getWidgetSchema()->setNameFormat("editEvents[$i][%s]");
$i++ ?>
- <tr class="related_obj_<?php echo $item->id ?>">
+ <tr class="date related_obj_<?php echo $item->id ?>">
<td>
<div class="animateNicely">
<input name="<?php echo
$form->getWidgetSchema()->generateName('id') ?>" type="hidden" value="<?php
echo $item->id ?>"/>
@@ -54,7 +55,7 @@
<?php $form->getWidgetSchema()->setNameFormat("editEvents[$i][%s]");
$i++ ?>
- <tr>
+ <tr class="date">
<td>
<div class="animateNicely">
<?php echo $form->type ?>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 20:20:45 2010 (r8356)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,5 +1,6 @@
<?php
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first') ?>
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('/vendor/yui/datasource/datasource-min') ?>
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('dialog') ?>
@@ -97,7 +98,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
- <table class="inline" id="relatedEntity">
+ <table class="date inline" id="relatedEntity">
<caption>
<?php echo __('Related authority record') ?>
</caption><tbody>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Thu Oct 21 20:20:45 2010 (r8356)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,5 +1,6 @@
<?php
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first') ?>
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('/vendor/yui/datasource/datasource-min') ?>
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('dialog') ?>
@@ -166,7 +167,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
- <table class="inline" id="functionRelation">
+ <table class="date inline" id="functionRelation">
<caption>
<?php echo __('Related function') ?>
</caption><tbody>
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Thu Oct 21 20:20:45 2010 (r8356)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Thu Oct 21 20:29:49 2010 (r8357)
@@ -1,5 +1,6 @@
<?php
$sf_response->addStylesheet('/vendor/yui/container/assets/skins/sam/container',
'first') ?>
+<?php $sf_response->addJavaScript('date') ?>
<?php $sf_response->addJavaScript('/vendor/yui/datasource/datasource-min') ?>
<?php $sf_response->addJavaScript('/vendor/yui/container/container-min') ?>
<?php $sf_response->addJavaScript('dialog') ?>
@@ -97,7 +98,7 @@
) ?>
<!-- NOTE dialog.js wraps this *entire* table in a YUI dialog -->
- <table class="inline" id="relatedResource">
+ <table class="date inline" id="relatedResource">
<caption>
<?php echo __('Related resource') ?>
</caption><tbody>
--
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.
