Author: sevein
Date: Thu Jun 21 17:48:49 2012
New Revision: 11795
Log:
Make hasChildren() a method in the base classes for nested entities
Modified:
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitMenu.php
trunk/lib/model/QubitTerm.php
trunk/lib/model/om/BaseActor.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseInformationObject.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BasePhysicalObject.php
trunk/lib/model/om/BaseTaxonomy.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/propel/builder/QubitObjectBuilder.php
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Thu Jun 21 17:33:20 2012
(r11794)
+++ trunk/lib/model/QubitInformationObject.php Thu Jun 21 17:48:49 2012
(r11795)
@@ -1841,17 +1841,6 @@
}
/**
- * Speed-optimized method for checking if information object has children
- * which doesn't require hitting database.
- *
- * @return boolean - true if has children
- */
- public function hasChildren()
- {
- return ($this->rgt - $this->lft) > 1;
- }
-
- /**
* Return the correct class instance for the current standards-based template
* (e.g. 'sfRadPlugin', 'sfIsadPlugin')
*
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/QubitMenu.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -129,16 +129,6 @@
}
/**
- * Test if menu has children
- *
- * @return boolean true if menu has children
- */
- public function hasChildren()
- {
- return ($this->getRgt() - $this->getLft() > 1);
- }
-
- /**
* Test if this menu is selected (based on current module/action)
*
* @return boolean
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/QubitTerm.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -1021,15 +1021,4 @@
return $yuiTree;
}
-
- /**
- * Speed-optimized method for checking if information object has children
- * which doesn't require hitting database.
- *
- * @return boolean - true if has children
- */
- public function hasChildren()
- {
- return ($this->rgt - $this->lft) > 1;
- }
}
Modified: trunk/lib/model/om/BaseActor.php
==============================================================================
--- trunk/lib/model/om/BaseActor.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/om/BaseActor.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -631,6 +631,11 @@
return $actorI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitActor::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitActor::RGT, $this->rgt, Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Thu Jun 21 17:33:20 2012
(r11794)
+++ trunk/lib/model/om/BaseDigitalObject.php Thu Jun 21 17:48:49 2012
(r11795)
@@ -358,6 +358,11 @@
return self::adddigitalObjectsRelatedByparentIdCriteriaById($criteria,
$this->id);
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitDigitalObject::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitDigitalObject::RGT, $this->rgt,
Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseInformationObject.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObject.php Thu Jun 21 17:33:20
2012 (r11794)
+++ trunk/lib/model/om/BaseInformationObject.php Thu Jun 21 17:48:49
2012 (r11795)
@@ -609,6 +609,11 @@
return $informationObjectI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitInformationObject::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitInformationObject::RGT, $this->rgt,
Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/om/BaseMenu.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -798,6 +798,11 @@
return $menuI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitMenu::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitMenu::RGT, $this->rgt, Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BasePhysicalObject.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObject.php Thu Jun 21 17:33:20 2012
(r11794)
+++ trunk/lib/model/om/BasePhysicalObject.php Thu Jun 21 17:48:49 2012
(r11795)
@@ -481,6 +481,11 @@
return $physicalObjectI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitPhysicalObject::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitPhysicalObject::RGT, $this->rgt,
Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseTaxonomy.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomy.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/om/BaseTaxonomy.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -516,6 +516,11 @@
return $taxonomyI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitTaxonomy::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitTaxonomy::RGT, $this->rgt,
Criteria::GREATER_THAN);
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Thu Jun 21 17:33:20 2012 (r11794)
+++ trunk/lib/model/om/BaseTerm.php Thu Jun 21 17:48:49 2012 (r11795)
@@ -1743,6 +1743,11 @@
return $termI18ns[$options['culture']];
}
+ public function hasChildren()
+ {
+ return ($this->lft - $this->lft) > 1;
+ }
+
public function addAncestorsCriteria(Criteria $criteria)
{
return $criteria->add(QubitTerm::LFT, $this->lft,
Criteria::LESS_THAN)->add(QubitTerm::RGT, $this->rgt, Criteria::GREATER_THAN);
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Thu Jun 21 17:33:20
2012 (r11794)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Thu Jun 21 17:48:49
2012 (r11795)
@@ -254,6 +254,7 @@
if (isset($this->nestedSetLeftColumn) &&
isset($this->nestedSetRightColumn))
{
+ $this->addHasChildren($script);
$this->addAddAncestorsCriteria($script);
$this->addAddDescendantsCriteria($script);
$this->addUpdateNestedSet($script);
@@ -1869,6 +1870,18 @@
script;
}
+ protected function addHasChildren(&$script)
+ {
+ $script .= <<<script
+
+ public function hasChildren()
+ {
+ return (\$this->{$this->getColumnVarName($this->nestedSetLeftColumn)} -
\$this->{$this->getColumnVarName($this->nestedSetLeftColumn)}) > 1;
+ }
+
+script;
+ }
+
protected function addAddAncestorsCriteria(&$script)
{
$script .= <<<script
--
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.
