COmanage Developers List

Author: benno
Date: 2013-01-25 23:47:51 -0500 (Fri, 25 Jan 2013)
New Revision: 413

Modified:
   registry/trunk/app/Lib/enum.php
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/Model/EmailAddress.php
   registry/trunk/app/View/CoPeople/fields.inc
   registry/trunk/app/View/EmailAddresses/fields.inc
   registry/trunk/app/View/OrgIdentities/fields.inc
Log:
EmailAddress gets its own type enum (CO-532)

Modified: registry/trunk/app/Lib/enum.php
===================================================================
--- registry/trunk/app/Lib/enum.php     2013-01-26 04:40:40 UTC (rev 412)
+++ registry/trunk/app/Lib/enum.php     2013-01-26 04:47:51 UTC (rev 413)
@@ -107,6 +107,13 @@
   );*/
 }
 
+class EmailAddressEnum {
+  const Delivery      = 'D';
+  const Forwarding    = 'F';
+  const Official      = 'O';
+  const Personal      = 'P';
+}
+
 class EnrollmentAuthzEnum {
   const CoAdmin       = 'CA';
   const CoGroupMember = 'CG';

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2013-01-26 04:40:40 UTC (rev 412)
+++ registry/trunk/app/Lib/lang.php     2013-01-26 04:47:51 UTC (rev 413)
@@ -158,9 +158,12 @@
                                  ContactEnum::Postal => 'Postal',
                                  ContactEnum::Forwarding => 'Forwarding'),
   
-  'en.contact.mail' =>     array(ContactEnum::Home => 'Home',
-                                 ContactEnum::Mobile => 'Mobile',
-                                 ContactEnum::Office => 'Office'),
+  'en.contact.mail' => array(
+    EmailAddressEnum::Delivery => 'Delivery',
+    EmailAddressEnum::Forwarding => 'Forwarding',
+    EmailAddressEnum::Official => 'Official',
+    EmailAddressEnum::Personal => 'Personal'
+  ),
   
   'en.contact.phone' => array(ContactEnum::Fax => 'Fax',
                               ContactEnum::Home => 'Home',

Modified: registry/trunk/app/Model/EmailAddress.php
===================================================================
--- registry/trunk/app/Model/EmailAddress.php   2013-01-26 04:40:40 UTC (rev 
412)
+++ registry/trunk/app/Model/EmailAddress.php   2013-01-26 04:47:51 UTC (rev 
413)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Email Address Model
  *
- * 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) 2010-12 University Corporation for Advanced 
Internet Development, Inc.
+ * @copyright     Copyright (C) 2010-13 University Corporation for Advanced 
Internet Development, Inc.
  * @link          http://www.internet2.edu/comanage COmanage Project
  * @package       registry
  * @since         COmanage Registry v0.1
@@ -56,8 +56,10 @@
       'message' => 'Please enter a valid email address'
     ),
     'type' => array(
-      'rule' => array('inList', array(ContactEnum::Home,
-                                      ContactEnum::Office)),
+      'rule' => array('inList', array(EmailAddressEnum::Delivery,
+                                      EmailAddressEnum::Forwarding,
+                                      EmailAddressEnum::Official,
+                                      EmailAddressEnum::Personal)),
       'required' => false,
       'allowEmpty' => false
     ),

Modified: registry/trunk/app/View/CoPeople/fields.inc
===================================================================
--- registry/trunk/app/View/CoPeople/fields.inc 2013-01-26 04:40:40 UTC (rev 
412)
+++ registry/trunk/app/View/CoPeople/fields.inc 2013-01-26 04:47:51 UTC (rev 
413)
@@ -443,7 +443,7 @@
                       print '<div>';
                         print '<div>';
                           print $this->Html->link($ea['mail'], 
array('controller' => 'email_addresses', 'action' => 'edit', $ea['id'], 'co' 
=> $cur_co['Co']['id']));
-                          print " (" . _txt('en.contact', null, $ea['type']) 
. ", "
+                          print " (" . _txt('en.contact.mail', null, 
$ea['type']) . ", "
                           . ($ea['verified'] ? 
_txt('fd.email_address.verified') : _txt('fd.email_address.unverified')) . 
")<br />\n";
                         print '</div>';
                         print '<div>';

Modified: registry/trunk/app/View/EmailAddresses/fields.inc
===================================================================
--- registry/trunk/app/View/EmailAddresses/fields.inc   2013-01-26 04:40:40 
UTC (rev 412)
+++ registry/trunk/app/View/EmailAddresses/fields.inc   2013-01-26 04:47:51 
UTC (rev 413)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry Email Address Fields
  *
- * 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
@@ -79,7 +79,7 @@
           
           if($e) {
             print $this->Form->select('type',
-                                      $cm_texts[ $cm_lang ]['en.contact'],
+                                      $cm_texts[ $cm_lang 
]['en.contact.mail'],
                                       $attrs);
             
             if($this->Form->isFieldError('type')) {

Modified: registry/trunk/app/View/OrgIdentities/fields.inc
===================================================================
--- registry/trunk/app/View/OrgIdentities/fields.inc    2013-01-26 04:40:40 
UTC (rev 412)
+++ registry/trunk/app/View/OrgIdentities/fields.inc    2013-01-26 04:47:51 
UTC (rev 413)
@@ -2,7 +2,7 @@
 /**
  * COmanage Registry OrgIdentity Fields
  *
- * Copyright (C) 2011-12 University Corporation for Advanced Internet 
Development, Inc.
+ * Copyright (C) 2011-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.2
@@ -420,7 +420,7 @@
                                                                'action' => 
'edit',
                                                                $ea['id'],
                                                                'co' => 
($pool_org_identities ? false : $cur_co['Co']['id'])));
-                    print "&nbsp;(" . _txt('en.contact', null, $ea['type']) 
. ", "
+                    print "&nbsp;(" . _txt('en.contact.mail', null, 
$ea['type']) . ", "
                       . ($ea['verified'] ? _txt('fd.email_address.verified') 
: _txt('fd.email_address.unverified')) . ")";
                   print '</div>';
                   print '<div>';