Author: sevein
Date: Mon Jul 11 23:31:13 2011
New Revision: 9286

Log:
Process donor dialog correctly

Modified:
   
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
   
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/relatedDonorComponent.class.php

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jul 11 23:29:44 2011        (r9285)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jul 11 23:31:13 2011        (r9286)
@@ -76,7 +76,7 @@
 
     $this->response->setTitle("$title - {$this->response->getTitle()}");
 
-    $this->relatedDonorComponent = new 
qtAccessionPluginRelatedDonorComponent($this->context, 'qtAccessionPlugin', 
'relatedComponent');
+    $this->relatedDonorComponent = new 
qtAccessionPluginRelatedDonorComponent($this->context, 'qtAccessionPlugin', 
'relatedDonor');
     $this->relatedDonorComponent->resource = $this->resource;
     $this->relatedDonorComponent->execute($this->request);
   }
@@ -262,6 +262,17 @@
       $this->form->bind($request->getPostParameters());
       if ($this->form->isValid())
       {
+        $this->relatedDonorComponent->processForm();
+
+        if (isset($this->request->deleteRelations))
+        {
+          foreach ($this->request->deleteRelations as $item)
+          {
+            $params = $this->context->routing->parse(Qubit::pathInfo($item));
+            $params['_sf_route']->resource->delete();
+          }
+        }
+
         $this->processForm();
 
         $this->resource->save();

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/relatedDonorComponent.class.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/relatedDonorComponent.class.php
   Mon Jul 11 23:29:44 2011        (r9285)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/relatedDonorComponent.class.php
   Mon Jul 11 23:31:13 2011        (r9286)
@@ -28,12 +28,8 @@
   {
     parent::execute($request);
 
-    $this->form->getWidgetSchema()->setNameFormat('relatedDonorRecord[%s]');
+    $this->form->getWidgetSchema()->setNameFormat('relatedDonor[%s]');
 
-    // Use qtAccessionPlugin/lib/qtAccessionPlugin.class.php getter? Is being 
run twice?
-    $criteria = new Criteria;
-    $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
-    $criteria->addJoin(QubitRelation::OBJECT_ID, QubitDonor::ID);
-    $this->relatedDonorRecord = QubitRelation::get($criteria);
+    $this->relatedDonorRecord = 
QubitRelation::getRelationsBySubjectId($this->resource->id);
   }
 }

-- 
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.

Reply via email to