Author: david
Date: Fri Dec 11 13:58:56 2009
New Revision: 4152
Log:
Change name of QubitRelation 'getRelationsBySubjectOrObjectId()' method ->
'getBySubjectOrObjectId()'.
Modified:
trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
trunk/apps/qubit/modules/function/actions/deleteAction.class.php
trunk/apps/qubit/modules/function/actions/editAction.class.php
trunk/apps/qubit/modules/term/actions/editAction.class.php
trunk/apps/qubit/modules/term/actions/showAction.class.php
trunk/lib/model/QubitRelation.php
Modified: trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Fri Dec
11 13:10:47 2009 (r4151)
+++ trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Fri Dec
11 13:58:56 2009 (r4152)
@@ -46,7 +46,7 @@
}
}
- foreach
(QubitRelation::getRelationsBySubjectOrObjectId($this->actor->id) as $relation)
+ foreach (QubitRelation::getBySubjectOrObjectId($this->actor->id) as
$relation)
{
$relation->delete();
}
Modified: trunk/apps/qubit/modules/function/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/deleteAction.class.php Fri Dec
11 13:10:47 2009 (r4151)
+++ trunk/apps/qubit/modules/function/actions/deleteAction.class.php Fri Dec
11 13:58:56 2009 (r4152)
@@ -33,7 +33,7 @@
if ($request->isMethod('delete'))
{
// Delete relationships
- foreach (QubitRelation::getRelationsBySubjectOrObjectId($this->func->id)
as $relation)
+ foreach (QubitRelation::getBySubjectOrObjectId($this->func->id) as
$relation)
{
$relation->delete();
}
Modified: trunk/apps/qubit/modules/function/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Dec
11 13:10:47 2009 (r4151)
+++ trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Dec
11 13:58:56 2009 (r4152)
@@ -398,7 +398,7 @@
$this->form->setWidget('serialNumber', new sfWidgetFormInputHidden);
}
- $this->relatedFunctions =
QubitRelation::getRelationsBySubjectOrObjectId($this->func->id);
+ $this->relatedFunctions =
QubitRelation::getBySubjectOrObjectId($this->func->id);
// Determine if user has edit priviliges
$this->editTaxonomyCredentials = false;
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Fri Dec 11
13:10:47 2009 (r4151)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Fri Dec 11
13:58:56 2009 (r4152)
@@ -84,7 +84,7 @@
$this->sourceNotes = $this->term->getNotesByType($options =
array('noteTypeId' => QubitTerm::SOURCE_NOTE_ID));
$this->displayNotes = $this->term->getNotesByType($options =
array('noteTypeId' => QubitTerm::DISPLAY_NOTE_ID));
- $this->termRelations =
QubitRelation::getRelationsBySubjectOrObjectId($this->term->getId());
+ $this->termRelations =
QubitRelation::getBySubjectOrObjectId($this->term->getId());
foreach ($this->termRelations as $relation)
{
Modified: trunk/apps/qubit/modules/term/actions/showAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/showAction.class.php Fri Dec 11
13:10:47 2009 (r4151)
+++ trunk/apps/qubit/modules/term/actions/showAction.class.php Fri Dec 11
13:58:56 2009 (r4152)
@@ -33,7 +33,7 @@
$this->uses = QubitRelation::getRelationsByObjectId($this->term->id,
array('typeId' => QubitTerm::TERM_RELATION_EQUIVALENCE_ID));
$this->useFors = QubitRelation::getRelationsBySubjectId($this->term->id,
array('typeId' => QubitTerm::TERM_RELATION_EQUIVALENCE_ID));
- $this->associateRelations =
QubitRelation::getRelationsBySubjectOrObjectId($this->term->id, array('typeId'
=> QubitTerm::TERM_RELATION_ASSOCIATIVE_ID));
+ $this->associateRelations =
QubitRelation::getBySubjectOrObjectId($this->term->id, array('typeId' =>
QubitTerm::TERM_RELATION_ASSOCIATIVE_ID));
// Count related object for delete confirmation
$this->relatedObjectCount = $this->term->getRelatedObjectCount();
Modified: trunk/lib/model/QubitRelation.php
==============================================================================
--- trunk/lib/model/QubitRelation.php Fri Dec 11 13:10:47 2009 (r4151)
+++ trunk/lib/model/QubitRelation.php Fri Dec 11 13:58:56 2009 (r4152)
@@ -167,7 +167,7 @@
* @param array $options optional parameters
* @return QubitQuery collection of QubitRelation objects
*/
- public static function getRelationsBySubjectOrObjectId($id, $options=array())
+ public static function getBySubjectOrObjectId($id, $options=array())
{
$criteria = new Criteria;
--
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.
