COmanage Developers List

Author: marie
Date: 2012-02-17 18:39:09 -0500 (Fri, 17 Feb 2012)
New Revision: 230

Modified:
   registry/trunk/app/View/CoNsfDemographics/fields.inc
   registry/trunk/app/View/Standard/edit.ctp
Log:
co-250

Modified: registry/trunk/app/View/CoNsfDemographics/fields.inc
===================================================================
--- registry/trunk/app/View/CoNsfDemographics/fields.inc        2012-02-17 
13:43:49 UTC (rev 229)
+++ registry/trunk/app/View/CoNsfDemographics/fields.inc        2012-02-17 
23:39:09 UTC (rev 230)
@@ -58,7 +58,7 @@
   // Set hidden defaults for CO and CoPerson id so users don't need to see it
   $args = array('default' => $cur_co['Co']['id']);
   print $this->Form->hidden('co_id', $args). "\n";
-  $args = array('default' => 
$this->request->params['named']['co_person_id']);
+  $args = array('default' => $this->request['data']['CoPerson']['id']);
   print $this->Form->hidden('co_person_id', $args). "\n";
 
   print "
@@ -119,7 +119,7 @@
       </td>
       <td>
         <?php
-          $attrs['value'] = (isset($co_nsf_demographics) ? 
$co_nsf_demographics[0]['CoNsfDemographic']['citizen'] : '');
+          $attrs['value'] = (isset($co_nsf_demographics) ? 
$co_nsf_demographics[0]['CoNsfDemographic']['citizenship'] : '');
           $attrs['empty'] = false;
           
           if($e) {

Modified: registry/trunk/app/View/Standard/edit.ctp
===================================================================
--- registry/trunk/app/View/Standard/edit.ctp   2012-02-17 13:43:49 UTC (rev 
229)
+++ registry/trunk/app/View/Standard/edit.ctp   2012-02-17 23:39:09 UTC (rev 
230)
@@ -47,8 +47,10 @@
     $h = _txt('op.edit-a', array(Sanitize::html($d[0][$req]['line1'])));
   elseif(isset($d[0][$req]['label']))
     $h = _txt('op.edit-a', array(Sanitize::html($d[0][$req]['label'])));
+  elseif(isset($d[0][$req]['name']))
+    $h = _txt('op.edit-a', array(Sanitize::html($d[0][$req]['name'])));
   else
-    $h = _txt('op.edit-a', array(Sanitize::html($d[0][$req]['name'])));
+    $h = _txt('op.edit');
 ?>
 <h1 class="ui-state-default"><?php echo $h; ?></h1>
 
@@ -59,4 +61,4 @@
                                  'inputDefaults' => array('label' => false, 
'div' => false)));
   include(APP . "View/" . $model . "/fields.inc");
   echo $this->Form->end();
-?>
\ No newline at end of file
+?>