Author: sevein
Date: Mon Jul 11 20:52:00 2011
New Revision: 9282

Log:
QubitRelation(s): sbj=infoObject@obj=accession and sbj=actor@obj=accession

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

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jul 11 20:19:55 2011        (r9281)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/actions/editAction.class.php
      Mon Jul 11 20:52:00 2011        (r9282)
@@ -146,14 +146,10 @@
         break;
 
       case 'creators':
-        $criteria = new Criteria;
-        $criteria->add(QubitRelation::SUBJECT_ID, $this->resource->id);
-        $criteria->add(QubitRelation::TYPE_ID, QubitTerm::CREATION_ID);
-
         $value = $choices = array();
-        foreach ($this->creators = QubitRelation::get($criteria) as $item)
+        foreach ($this->creators = 
QubitRelation::getRelationsByObjectId($this->resource->id, array('typeId' => 
QubitRelation::TYPE_ID)) as $item)
         {
-          $choices[$value[] = $this->context->routing->generate(null, 
array($item->object, 'module' => 'actor'))] = $item->object;
+          $choices[$value[] = $this->context->routing->generate(null, 
array($item->subject, 'module' => 'actor'))] = $item->subject;
         }
 
         $this->form->setDefault('creators', $value);
@@ -229,13 +225,13 @@
         foreach ($filtered as $item)
         {
           $relation = new QubitRelation;
-          $relation->object = $item;
+          $relation->subject = $item;
           $relation->typeId = QubitTerm::CREATION_ID;
 
-          $this->resource->relationsRelatedBysubjectId[] = $relation;
+          $this->resource->relationsRelatedByobjectId[] = $relation;
         }
 
-        break;    
+        break;
 
       case 'acquisitionType':
       case 'processingPriority':

Modified: 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
==============================================================================
--- 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
        Mon Jul 11 20:19:55 2011        (r9281)
+++ 
trunk/plugins/qtAccessionPlugin/modules/qtAccessionPlugin/templates/indexSuccess.php
        Mon Jul 11 20:52:00 2011        (r9282)
@@ -40,8 +40,8 @@
     <h3><?php echo __('Creators') ?></h3>
     <div>
       <ul>
-        <?php foreach (QubitRelation::getRelationsBySubjectId($resource->id, 
array('typeId' => QubitTerm::CREATION_ID)) as $item): ?>
-          <li><?php echo link_to(render_title($item->object), 
array($item->object, 'module' => 'actor')) ?></li>
+        <?php foreach (QubitRelation::getRelationsByObjectId($resource->id, 
array('typeId' => QubitTerm::CREATION_ID)) as $item): ?>
+          <li><?php echo link_to(render_title($item->subject), 
array($item->subject, 'module' => 'actor')) ?></li>
         <?php endforeach; ?>
       </ul>
     </div>
@@ -73,7 +73,7 @@
 
   <h2><?php echo __('Information object area') ?></h2>
 
-  <?php foreach (QubitRelation::getRelationsByObjectId($resource->id) as 
$item): ?>
+  <?php foreach (QubitRelation::getRelationsByObjectId($resource->id, 
array('typeId' => QubitTerm::ACCESSION_ID)) as $item): ?>
 
     <div class="field">
       <h3>Information object</h3>

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