COmanage Developers List

Author: benno
Date: 2012-09-25 23:48:21 -0400 (Tue, 25 Sep 2012)
New Revision: 370

Modified:
   registry/trunk/app/Controller/AppController.php
   registry/trunk/app/Lib/lang.php
   registry/trunk/app/Model/CoPetition.php
   registry/trunk/app/View/CoEnrollmentFlows/fields.inc
   registry/trunk/app/View/Elements/dropMenu.ctp
Log:
Additional fixes for CO-436

Modified: registry/trunk/app/Controller/AppController.php
===================================================================
--- registry/trunk/app/Controller/AppController.php     2012-09-26 01:39:03 
UTC (rev 369)
+++ registry/trunk/app/Controller/AppController.php     2012-09-26 03:48:21 
UTC (rev 370)
@@ -1250,7 +1250,7 @@
     $p['menu']['cos'] = $cmr['admin'] || $cmr['subadmin'];
     
     // Select from available enrollment flows?
-    $p['menu']['enrollmentflows'] = $cmr['user'];
+    $p['menu']['createpetition'] = $cmr['user'];
     
     // Manage any CO (or COU) population?
     $p['menu']['petitions'] = $cmr['admin'] || $cmr['subadmin'];

Modified: registry/trunk/app/Lib/lang.php
===================================================================
--- registry/trunk/app/Lib/lang.php     2012-09-26 01:39:03 UTC (rev 369)
+++ registry/trunk/app/Lib/lang.php     2012-09-26 03:48:21 UTC (rev 370)
@@ -535,6 +535,7 @@
   'op.logout' =>      'Logout',
   'op.ok' =>          'OK',
   'op.petition' =>    'Petition',
+  'op.petition.create' => 'Create Petition',
   'op.proceed.ok' =>  'Are you sure you wish to proceed?',
   'op.remove' =>      'Remove',
   'op.save' =>        'Save',

Modified: registry/trunk/app/Model/CoPetition.php
===================================================================
--- registry/trunk/app/Model/CoPetition.php     2012-09-26 01:39:03 UTC (rev 
369)
+++ registry/trunk/app/Model/CoPetition.php     2012-09-26 03:48:21 UTC (rev 
370)
@@ -254,10 +254,10 @@
     
     // Determine an initial status. We don't jump straight to Active, since 
post-creation actions may be required for that.
     
-    $confirmEmail = $this->CoEnrollmentFlow->field('confirm_email',
+    $verifyEmail = $this->CoEnrollmentFlow->field('verify_email',
                                                    
array('CoEnrollmentFlow.id' => $enrollmentFlowID));
     
-    $requireAuthn = $this->CoEnrollmentFlow->field('confirm_email',
+    $requireAuthn = $this->CoEnrollmentFlow->field('require_authn',
                                                    
array('CoEnrollmentFlow.id' => $enrollmentFlowID));
     
     $approvalPolicy = $this->CoEnrollmentFlow->field('approval_required',
@@ -265,7 +265,7 @@
     
     $initialStatus = StatusEnum::Approved;
     
-    if($confirmEmail || $requireAuthn) {
+    if($verifyEmail || $requireAuthn) {
       $initialStatus = StatusEnum::PendingConfirmation;
     } elseif($approvalPolicy) {
       $initialStatus = StatusEnum::PendingApproval;
@@ -797,7 +797,7 @@
     
     // Send email invite if configured
     
-    if($confirmEmail) {
+    if($verifyEmail) {
       // We need an email address to send to. Since we don't have a 
mechanism for
       // picking from multiple at the moment, we just pick the first one 
provided
       // (which in most cases will be sufficient).

Modified: registry/trunk/app/View/CoEnrollmentFlows/fields.inc
===================================================================
--- registry/trunk/app/View/CoEnrollmentFlows/fields.inc        2012-09-26 
01:39:03 UTC (rev 369)
+++ registry/trunk/app/View/CoEnrollmentFlows/fields.inc        2012-09-26 
03:48:21 UTC (rev 370)
@@ -241,8 +241,8 @@
       </td>
       <td>
         <?php print ($e
-                     ? $this->Form->input('confirm_email')
-                     : 
Sanitize::html($co_enrollment_flows[0]['CoEnrollmentFlow']['confirm_email']));
 ?>
+                     ? $this->Form->input('verify_email')
+                     : 
Sanitize::html($co_enrollment_flows[0]['CoEnrollmentFlow']['verify_email'])); 
?>
       </td>
     </tr>
     <tr class="line1">

Modified: registry/trunk/app/View/Elements/dropMenu.ctp
===================================================================
--- registry/trunk/app/View/Elements/dropMenu.ctp       2012-09-26 01:39:03 
UTC (rev 369)
+++ registry/trunk/app/View/Elements/dropMenu.ctp       2012-09-26 03:48:21 
UTC (rev 370)
@@ -69,14 +69,14 @@
                   print "</li>";
                 }
 
-                if(isset($permissions['menu']['enrollmentflows']) && 
$permissions['menu']['enrollmentflows']) {
+                if(isset($permissions['menu']['createpetition']) && 
$permissions['menu']['createpetition']) {
                   print "<li>";
                     $args = array(
                     'controller' => 'co_enrollment_flows',
                     'action' => 'select',
                     'co' => $menuCoId
                     );
-                    print 
$this->Html->link(_txt('ct.co_enrollment_flows.pl'), $args);
+                    print $this->Html->link(_txt('op.petition.create'), 
$args);
                   print "</li>";
                 }