Author: peter
Date: 2008-11-11 13:12:00 -0800 (Tue, 11 Nov 2008)
New Revision: 1567

Modified:
   trunk/qubit/apps/qubit/modules/actor/templates/_contextMenu.php
   trunk/qubit/lib/model/QubitActor.php
Log:
clarify Actor role relationship to information objects in context menu. Fixes 
issue#310

Modified: trunk/qubit/apps/qubit/modules/actor/templates/_contextMenu.php
===================================================================
--- trunk/qubit/apps/qubit/modules/actor/templates/_contextMenu.php     
2008-11-11 21:01:26 UTC (rev 1566)
+++ trunk/qubit/apps/qubit/modules/actor/templates/_contextMenu.php     
2008-11-11 21:12:00 UTC (rev 1567)
@@ -9,7 +9,7 @@
   <?php if ($informationObjectRelations): ?>
     <?php foreach ($informationObjectRelations as $relation): ?>
       <div class="label">
-        <?php echo $relation->getType()->getRole() ?>
+        <?php echo __('%1% of', array('%1%' => 
$relation->getType()->getRole())) ?>
       </div>
       <div>
         <?php echo link_to($relation->getInformationObject(), 
'informationobject/show?id='.$relation->getInformationObjectId()) ?>

Modified: trunk/qubit/lib/model/QubitActor.php
===================================================================
--- trunk/qubit/lib/model/QubitActor.php        2008-11-11 21:01:26 UTC (rev 
1566)
+++ trunk/qubit/lib/model/QubitActor.php        2008-11-11 21:12:00 UTC (rev 
1567)
@@ -378,7 +378,7 @@
     $criteria = new Criteria;
     $criteria->add(QubitEvent::ACTOR_ID, $this->getId());
     $criteria->addJoin(QubitEvent::INFORMATION_OBJECT_ID, 
QubitInformationObject::ID);
-    $criteria->addGroupByColumn(QubitEvent::INFORMATION_OBJECT_ID);
+    $criteria->addGroupByColumn(QubitEvent::TYPE_ID);
 
     return QubitEvent::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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to