Author: jablko
Date: Sun Oct 17 17:56:27 2010
New Revision: 8208
Log:
Reorganize
Modified:
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordsComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionsComponent.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourcesComponent.class.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
Sun Oct 17 17:51:13 2010 (r8207)
+++
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
Sun Oct 17 17:56:27 2010 (r8208)
@@ -113,7 +113,7 @@
}
}
- if (!isset($this->request->source) &&
is_array($this->request->deleteEvents))
+ if (!isset($this->request->source) && isset($this->request->deleteEvents))
{
foreach ($this->request->deleteEvents as $item)
{
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
Sun Oct 17 17:51:13 2010 (r8207)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/editAction.class.php
Sun Oct 17 17:56:27 2010 (r8208)
@@ -183,6 +183,14 @@
$this->relatedFunctionsComponent->processForm();
$this->relatedResourcesComponent()->processForm();
+ if (isset($this->request->deleteRelations))
+ {
+ foreach ($this->request->deleteRelations as $item)
+ {
+ QubitRelation::getById($item)->delete();
+ }
+ }
+
return parent::processForm();
}
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordsComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordsComponent.class.php
Sun Oct 17 17:51:13 2010 (r8207)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedAuthorityRecordsComponent.class.php
Sun Oct 17 17:56:27 2010 (r8208)
@@ -46,26 +46,6 @@
protected function processForm()
{
- $this->updateOtherRelations('relatedEntity');
- $this->deleteRelations();
- }
-
- public function execute($request)
- {
- parent::execute($request);
-
-
$this->form->getWidgetSchema()->setNameFormat('relatedAuthorityRecords[%s]');
-
- // Get actors (object) related to this function (subject)
- $criteria = new Criteria;
- $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
- $criteria->addJoin(QubitRelation::OBJECT_ID, QubitActor::ID);
-
- $this->relations = QubitRelation::get($criteria);
- }
-
- protected function updateOtherRelations($formName)
- {
if (isset($this->request["{$formName}s"]))
{
// JavaScript (multiple) relationship update
@@ -134,23 +114,19 @@
$this->resource->relationsRelatedBysubjectId[] = $relation;
}
-
- return $this;
}
- protected function deleteRelations()
+ public function execute($request)
{
- if (is_array($deleteRelations = $this->request->deleteRelations))
- {
- foreach ($deleteRelations as $deleteId => $doDelete)
- {
- if (null !== ($relation = QubitRelation::getById($deleteId)))
- {
- $relation->delete();
- }
- }
- }
+ parent::execute($request);
- return $this;
+
$this->form->getWidgetSchema()->setNameFormat('relatedAuthorityRecords[%s]');
+
+ // Get actors (object) related to this function (subject)
+ $criteria = new Criteria;
+ $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
+ $criteria->addJoin(QubitRelation::OBJECT_ID, QubitActor::ID);
+
+ $this->relations = QubitRelation::get($criteria);
}
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionsComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionsComponent.class.php
Sun Oct 17 17:51:13 2010 (r8207)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionsComponent.class.php
Sun Oct 17 17:56:27 2010 (r8208)
@@ -61,34 +61,6 @@
protected function processForm()
{
- $this->updateRelations();
- $this->deleteRelations();
- }
-
- public function execute($request)
- {
- parent::execute($request);
-
- $this->form->getWidgetSchema()->setNameFormat('relatedFunction[%s]');
-
- // Find function to function relations with current function as subject or
- // object
- $criteria = new Criteria;
- $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->resource->id, Criteria::EQUAL);
- $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->resource->id, Criteria::EQUAL);
- $criterion1->addOr($criterion2);
- $criteria->add($criterion1);
- $criteria->addAlias('ro', QubitFunction::TABLE_NAME);
- $criteria->addJoin(QubitRelation::OBJECT_ID, 'ro.id');
- $criteria->addAlias('rs', QubitFunction::TABLE_NAME);
- $criteria->addJoin(QubitRelation::SUBJECT_ID, 'rs.id');
- $criteria->addAscendingOrderByColumn(QubitRelation::TYPE_ID);
-
- $this->relations = QubitRelation::get($criteria);
- }
-
- protected function updateRelations()
- {
if (isset($this->request->relations))
{
// JavaScript (multiple) relationship update
@@ -156,23 +128,27 @@
$this->resource->relationsRelatedByobjectId[] = $relation;
}
}
-
- return $this;
}
- protected function deleteRelations()
+ public function execute($request)
{
- if (is_array($deleteRelations = $this->request->deleteRelations))
- {
- foreach ($deleteRelations as $deleteId => $doDelete)
- {
- if (null !== ($relation = QubitRelation::getById($deleteId)))
- {
- $relation->delete();
- }
- }
- }
+ parent::execute($request);
+
+ $this->form->getWidgetSchema()->setNameFormat('relatedFunction[%s]');
- return $this;
+ // Find function to function relations with current function as subject or
+ // object
+ $criteria = new Criteria;
+ $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->resource->id, Criteria::EQUAL);
+ $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->resource->id, Criteria::EQUAL);
+ $criterion1->addOr($criterion2);
+ $criteria->add($criterion1);
+ $criteria->addAlias('ro', QubitFunction::TABLE_NAME);
+ $criteria->addJoin(QubitRelation::OBJECT_ID, 'ro.id');
+ $criteria->addAlias('rs', QubitFunction::TABLE_NAME);
+ $criteria->addJoin(QubitRelation::SUBJECT_ID, 'rs.id');
+ $criteria->addAscendingOrderByColumn(QubitRelation::TYPE_ID);
+
+ $this->relations = QubitRelation::get($criteria);
}
}
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourcesComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourcesComponent.class.php
Sun Oct 17 17:51:13 2010 (r8207)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedResourcesComponent.class.php
Sun Oct 17 17:56:27 2010 (r8208)
@@ -46,26 +46,6 @@
protected function processForm()
{
- $this->updateOtherRelations('relatedResource');
- $this->deleteRelations();
- }
-
- public function execute($request)
- {
- parent::execute($request);
-
- $this->form->getWidgetSchema()->setNameFormat('relatedResource[%s]');
-
- // Get information objects (object) related to this function (subject)
- $criteria = new Criteria;
- $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
- $criteria->addJoin(QubitRelation::OBJECT_ID, QubitInformationObject::ID);
-
- $this->relations = QubitRelation::get($criteria);
- }
-
- protected function updateOtherRelations($formName)
- {
if (isset($this->request["{$formName}s"]))
{
// JavaScript (multiple) relationship update
@@ -134,23 +114,19 @@
$this->resource->relationsRelatedBysubjectId[] = $relation;
}
-
- return $this;
}
- protected function deleteRelations()
+ public function execute($request)
{
- if (is_array($deleteRelations = $this->request->deleteRelations))
- {
- foreach ($deleteRelations as $deleteId => $doDelete)
- {
- if (null !== ($relation = QubitRelation::getById($deleteId)))
- {
- $relation->delete();
- }
- }
- }
+ parent::execute($request);
- return $this;
+ $this->form->getWidgetSchema()->setNameFormat('relatedResource[%s]');
+
+ // Get information objects (object) related to this function (subject)
+ $criteria = new Criteria;
+ $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
+ $criteria->addJoin(QubitRelation::OBJECT_ID, QubitInformationObject::ID);
+
+ $this->relations = QubitRelation::get($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.
