Author: jablko
Date: Fri Aug 28 17:53:15 2009
New Revision: 3112

Log:
Drop $actorEvents because it's not used by any templates. Drop $notes 
assignment because it's reassigned.

Modified:
   trunk/apps/qubit/modules/informationobject/actions/showAction.class.php
   trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php

Modified: 
trunk/apps/qubit/modules/informationobject/actions/showAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showAction.class.php     
Fri Aug 28 17:32:52 2009        (r3111)
+++ trunk/apps/qubit/modules/informationobject/actions/showAction.class.php     
Fri Aug 28 17:53:15 2009        (r3112)
@@ -50,7 +50,6 @@
     }
 
     // Events
-    $this->actorEvents = $this->informationObject->getActorEvents();
     $this->creators = $this->informationObject->getCreators();
 
     // Notes
@@ -60,8 +59,7 @@
     $this->subjectAccessPoints = 
$this->informationObject->getSubjectAccessPoints();
     $this->placeAccessPoints = 
$this->informationObject->getPlaceAccessPoints();
     $this->nameAccessPoints = array();
-    $actorEvents = $this->informationObject->getActorEvents();
-    foreach ($actorEvents as $event)
+    foreach ($this->informationObject->getActorEvents() as $event)
     {
       if ($event->getActorId())
       {

Modified: 
trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php 
Fri Aug 28 17:32:52 2009        (r3111)
+++ trunk/apps/qubit/modules/informationobject/actions/showIsadAction.class.php 
Fri Aug 28 17:53:15 2009        (r3112)
@@ -35,10 +35,6 @@
     // run the core informationObject show action commands
     parent::execute($request);
 
-    // Omit title & publication notes from ISAD note list
-    $this->notes = $this->informationObject->getNotesByType(
-      array('exclude' => array(QubitTerm::TITLE_NOTE_ID, 
QubitTerm::PUBLICATION_NOTE_ID)));
-
     // Split notes into "Notes" (general notes), Title notes and Publication 
notes
     $this->notes = $this->informationObject->getNotesByType(array('noteTypeId' 
=> QubitTerm::GENERAL_NOTE_ID));
     $this->archivistsNotes = 
$this->informationObject->getNotesByType(array('noteTypeId' => 
QubitTerm::ARCHIVIST_NOTE_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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to