COmanage Developers List

Author: benno
Date: 2013-11-28 22:15:57 -0500 (Thu, 28 Nov 2013)
New Revision: 631

Modified:
   registry/trunk/app/Model/CoPetition.php
   registry/trunk/app/View/CoPetitions/petition-attributes.inc
Log:
Record who denied a petition (CO-728)

Modified: registry/trunk/app/Model/CoPetition.php
===================================================================
--- registry/trunk/app/Model/CoPetition.php     2013-11-29 01:46:05 UTC (rev 
630)
+++ registry/trunk/app/Model/CoPetition.php     2013-11-29 03:15:57 UTC (rev 
631)
@@ -1132,9 +1132,10 @@
         throw new RuntimeException(_txt('er.db.save'));
       }
       
-      // If this is an approval, update the approver field as well
+      // If this is an approval or a denial, update the approver field as 
well
       
-      if($newPetitionStatus == StatusEnum::Approved) {
+      if($newPetitionStatus == StatusEnum::Approved
+         || $newPetitionStatus == StatusEnum::Denied) {
         if(!$this->saveField('approver_co_person_id', $actorCoPersonID)) {
           throw new RuntimeException(_txt('er.db.save'));
         }

Modified: registry/trunk/app/View/CoPetitions/petition-attributes.inc
===================================================================
--- registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-11-29 
01:46:05 UTC (rev 630)
+++ registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-11-29 
03:15:57 UTC (rev 631)
@@ -441,7 +441,7 @@
         <?php foreach ($co_petitions[0]['CoPetitionHistoryRecord'] as $hr): 
?>
         <tr class="line<?php print ($l % 2); $l++; ?>">
           <td><?php print $hr['action']; ?></td>
-          <td><?php print (!empty($hr['ActorCoPerson']['Name']) ? 
generateCn($hr['ActorCoPerson']['Name']) : _txt('fd.actor.self')); ?></td>
+          <td><?php print (!empty($hr['ActorCoPerson']['PrimaryName']) ? 
generateCn($hr['ActorCoPerson']['PrimaryName']) : _txt('fd.actor.self')); 
?></td>
           <td><?php print $hr['comment']; ?></td>
           <td><?php print $this->Time->nice($hr['created']); ?></td>
         </tr>