COmanage Developers List

Author: marie
Date: 2012-02-20 20:40:52 -0500 (Mon, 20 Feb 2012)
New Revision: 233

Modified:
   registry/trunk/app/Controller/CoNsfDemographicsController.php
   registry/trunk/app/Model/CoNsfDemographic.php
Log:
co-252

Modified: registry/trunk/app/Controller/CoNsfDemographicsController.php
===================================================================
--- registry/trunk/app/Controller/CoNsfDemographicsController.php       
2012-02-20 23:53:35 UTC (rev 232)
+++ registry/trunk/app/Controller/CoNsfDemographicsController.php       
2012-02-21 01:40:52 UTC (rev 233)
@@ -134,11 +134,12 @@
     }
 
     // Data doesn't already exist so encode for writing
-    $encoded = 
$this->CoNsfDemographic->encodeOptions($this->request->params['data']['CoNsfDemographic']);
+    $encoded = 
$this->CoNsfDemographic->encodeOptions($this->request->data['CoNsfDemographic']);
+    if(isset($encoded['race']))
+      $this->request->data['CoNsfDemographic']['race']     = 
$encoded['race'];
+    if(isset($encoded['disability']))
+    $this->request->data['CoNsfDemographic']['disability'] = 
$encoded['disability'];
 
-    $this->request->params['data']['CoNsfDemographic']['race']       = 
$encoded['race'];
-    $this->request->params['data']['CoNsfDemographic']['disability'] = 
$encoded['disability'];
-
     return true;
   }
   

Modified: registry/trunk/app/Model/CoNsfDemographic.php
===================================================================
--- registry/trunk/app/Model/CoNsfDemographic.php       2012-02-20 23:53:35 
UTC (rev 232)
+++ registry/trunk/app/Model/CoNsfDemographic.php       2012-02-21 01:40:52 
UTC (rev 233)
@@ -53,6 +53,8 @@
    */
   
   public function encodeOptions($d) {
+    $encoded = array();
+
     if(is_array($d['race']))
       $encoded['race'] = implode($d['race']);
     if(is_array($d['disability']))