COmanage Developers List

Author: benno
Date: 2013-09-05 19:24:47 -0400 (Thu, 05 Sep 2013)
New Revision: 584

Modified:
   registry/trunk/app/Controller/CoPetitionsController.php
   registry/trunk/app/View/Standard/json/view.ctp
   registry/trunk/app/View/Standard/xml/view.ctp
Log:
Additional commits for CO-115

Modified: registry/trunk/app/Controller/CoPetitionsController.php
===================================================================
--- registry/trunk/app/Controller/CoPetitionsController.php     2013-09-05 
21:29:00 UTC (rev 583)
+++ registry/trunk/app/Controller/CoPetitionsController.php     2013-09-05 
23:24:47 UTC (rev 584)
@@ -112,7 +112,9 @@
         }
         catch(Exception $e) {
           $this->Session->setFlash($e->getMessage(), '', array(), 'error');
-          parent::add();
+          
+          // Set page title for page refresh
+          $this->set('title_for_layout', _txt('op.add.new', 
array(_txt('ct.co_petitions.1'))));
         }
       } else {
         parent::add();

Modified: registry/trunk/app/View/Standard/json/view.ctp
===================================================================
--- registry/trunk/app/View/Standard/json/view.ctp      2013-09-05 21:29:00 
UTC (rev 583)
+++ registry/trunk/app/View/Standard/json/view.ctp      2013-09-05 23:24:47 
UTC (rev 584)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Standard JSON Index View
  *
- * Copyright (C) 2010-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2010-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -71,7 +71,7 @@
       
         foreach(array_keys($m['Name']) as $k)
         {
-          if(in_array($k, array('Honorific', 'Given', 'Middle', 'Family', 
'Suffix', 'Type'))
+          if(in_array($k, array('Honorific', 'Given', 'Middle', 'Family', 
'Suffix', 'Type', 'Language'))
              && $m['Name'][$k] != null)
             $a['Name'][$k] = $m['Name'][$k];
         }      

Modified: registry/trunk/app/View/Standard/xml/view.ctp
===================================================================
--- registry/trunk/app/View/Standard/xml/view.ctp       2013-09-05 21:29:00 
UTC (rev 583)
+++ registry/trunk/app/View/Standard/xml/view.ctp       2013-09-05 23:24:47 
UTC (rev 584)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Standard XML Index View
  *
- * Copyright (C) 2010-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2010-13 University Corporation for Advanced Internet 
Development, Inc.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may 
not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,7 @@
  * KIND, either express or implied. See the License for the specific 
language governing
  * permissions and limitations under the License.
  *
- * @copyright     Copyright (C) 2011-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2011-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -70,7 +70,7 @@
       
         foreach(array_keys($m['Name']) as $k)
         {
-          if(in_array($k, array('Honorific', 'Given', 'Middle', 'Family', 
'Suffix', 'Type'))
+          if(in_array($k, array('Honorific', 'Given', 'Middle', 'Family', 
'Suffix', 'Type', 'Language'))
              && $m['Name'][$k] != null)
             $a['Name'][$k] = $m['Name'][$k];
         }