COmanage Developers List

Author: benno
Date: 2012-08-23 20:31:06 -0400 (Thu, 23 Aug 2012)
New Revision: 344

Modified:
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/Model/CoExtendedAttribute.php
   registry/trunk/app/View/CoExtendedAttributes/fields.inc
Log:
Require extended attribute names to be lowercase (CO-427)

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2012-08-24 00:28:29 UTC (rev 343)
+++ registry/trunk/app/Lib/lang.php     2012-08-24 00:31:06 UTC (rev 344)
@@ -404,6 +404,7 @@
   'fd.identifier.login.desc' =>  'Allow this identifier to login to 
Registry',
   'fd.ids' =>         'Identifiers',
   'fd.index' =>       'Index',
+  'fd.lan.desc' =>    'Lowercase alphanumeric characters only',
   'fd.members' =>     'Members',
   'fd.modified' =>    'Modified',
   'fd.name' =>        'Name',

Modified: registry/trunk/app/Model/CoExtendedAttribute.php
===================================================================
--- registry/trunk/app/Model/CoExtendedAttribute.php    2012-08-24 00:28:29 
UTC (rev 343)
+++ registry/trunk/app/Model/CoExtendedAttribute.php    2012-08-24 00:31:06 
UTC (rev 344)
@@ -46,9 +46,9 @@
       'message' => 'A CO ID must be provided'
     ),
     'name' => array(
-      'rule' => 'alphaNumeric',
+      'rule' => array('custom', '/^[a-z0-9]*$/'),
       'required' => true,
-      'message' => 'A name must be provided and consist of alphanumeric 
characters'
+      'message' => 'A name must be provided and consist of lowercase, 
alphanumeric characters'
     ),
     'display_name' => array(
       'rule' => 'notEmpty',

Modified: registry/trunk/app/View/CoExtendedAttributes/fields.inc
===================================================================
--- registry/trunk/app/View/CoExtendedAttributes/fields.inc     2012-08-24 
00:28:29 UTC (rev 343)
+++ registry/trunk/app/View/CoExtendedAttributes/fields.inc     2012-08-24 
00:31:06 UTC (rev 344)
@@ -51,7 +51,7 @@
     <tr class="line1">
       <td>
         <?php echo _txt('fd.name'); ?><font class="required">*</font><br />
-        <i><?php echo _txt('fd.an.desc'); ?></i>
+        <i><?php echo _txt('fd.lan.desc'); ?></i>
       </td>
       <td>
         <?php echo ($e ? $this->Form->input('name') : 
Sanitize::html($co_extended_attributes[0]['CoExtendedAttribute']['name'])); ?>