Merge remote-tracking branch 'origin/develop'

MESH-Research · Oct 7, 2022 · f5bd7cc · f5bd7cc
2 parents 017725c + b8e4fb0
commit f5bd7cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Controller/HumanitiesCommonsIdpEnrollerCoPetitionsController.php b/Controller/HumanitiesCommonsIdpEnrollerCoPetitionsController.php
@@ -50,7 +50,7 @@ protected function execute_plugin_checkEligibility($id, $onFinish) {
 
     $args = array();
     $args['conditions']['HumanitiesCommonsIdpEnroller.co_enrollment_flow_wedge_id'] = $efwid;
-    $args['contain']                                             = false;
+    $args['contain']                                             = true;
     $config = $this->HumanitiesCommonsIdpEnroller->find('first', $args);
     if (empty($config)) {
       $this->Flash->set(_txt('er.humanitiescommonsidpenroller.account.noconfig'), array('key' => 'error'));
@@ -80,7 +80,7 @@ protected function execute_plugin_checkEligibility($id, $onFinish) {
 
     // If the petition already has a username then do not present
     // a form and just redirect.
-    if ($coPetition['CoPetition']['co_enrollment_flow_id'] != '604' ) {
+    if ($coPetition['CoPetition']['co_enrollment_flow_id'] != '654' ) {
     foreach($coPetition['EnrolleeCoPerson']['Identifier'] as $identifier) {
       if($identifier['type'] == $config['HumanitiesCommonsIdpEnroller']['username_id_type'] && 
           !empty($identifier['identifier']) ) {
@@ -248,7 +248,7 @@ protected function execute_plugin_selectEnrollee($id, $onFinish) {
 
     $args = array();
     $args['conditions']['HumanitiesCommonsIdpEnroller.co_enrollment_flow_wedge_id'] = $efwid;
-    $args['contain']                                             = false;
+    $args['contain']                                             = true;
     $config = $this->HumanitiesCommonsIdpEnroller->find('first', $args);
     if (empty($config)) {
       $this->Flash->set(_txt('er.humanitiescommonsidpenroller.account.noconfig'), array('key' => 'error'));

diff --git a/View/HumanitiesCommonsIdpEnrollerCoPetitions/check_eligibility.ctp b/View/HumanitiesCommonsIdpEnrollerCoPetitions/check_eligibility.ctp
@@ -33,7 +33,6 @@
   print $this->element("pageTitleAndButtons", $params);
 
   print $this->Form->create(false);
-  print $this->Form->hidden('CoPetition.co_enrollment_flow_wedge_id', array('default' => $vv_efwid));
 ?>
 
 <script type="text/javascript">