COmanage Developers List

Author: benno
Date: 2013-09-18 18:31:18 -0400 (Wed, 18 Sep 2013)
New Revision: 607

Modified:
   registry/trunk/app/View/CoPeople/match.ctp
   registry/trunk/app/View/CoPetitions/petition-attributes.inc
Log:
Restore rendering of advisory matches when completing petition (CO-695)

Modified: registry/trunk/app/View/CoPeople/match.ctp
===================================================================
--- registry/trunk/app/View/CoPeople/match.ctp  2013-09-18 18:31:20 UTC (rev 
606)
+++ registry/trunk/app/View/CoPeople/match.ctp  2013-09-18 22:31:18 UTC (rev 
607)
@@ -34,7 +34,10 @@
         array('controller' => 'co_people', 'action' => 'edit', 
$m['CoPerson']['id'], 'co' => $m['CoPerson']['co_id'])
       );
       if(isset($m['CoPersonRole'][0])) {
-        print " (" . $m['CoPersonRole'][0]['title'] . ", " . 
_txt('en.affil', null, $m['CoPersonRole'][0]['affiliation']) . ")";
+        print " ("
+              . (!empty($m['CoPersonRole'][0]['title']) ? 
$m['CoPersonRole'][0]['title'] . ", " : "")
+              . (!empty($m['CoPersonRole'][0]['affiliation']) ? 
_txt('en.affil', null, $m['CoPersonRole'][0]['affiliation']) : "")
+              . ")";
       }
       print "</li>\n";
     }

Modified: registry/trunk/app/View/CoPetitions/petition-attributes.inc
===================================================================
--- registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-09-18 
18:31:20 UTC (rev 606)
+++ registry/trunk/app/View/CoPetitions/petition-attributes.inc 2013-09-18 
22:31:18 UTC (rev 607)
@@ -60,6 +60,11 @@
   } 
 </style>
 
+<div>
+  <div id="results">
+  </div>
+</div>
+
 <div style = "overflow:hidden;">
   <?php 
     // Sort attributes by model for printing
@@ -297,10 +302,3 @@
     </table>
   </div>
 <?php endif; // action == add ?>
-
-<!-- begin 
-<div>
-  <div style="float:right;width:35%" id="results">
-  </div>
-</div>
-//-->
\ No newline at end of file