Merge pull request #7 from MESH-Research/develop

Develop
MESH-Research · Jun 11, 2021 · 4d0da60 · 4d0da60
2 parents 1c215df + 6fda856
commit 4d0da60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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']                                             = true;
+    $args['contain']                                             = false;
     $config = $this->HumanitiesCommonsIdpEnroller->find('first', $args);
     if (empty($config)) {
       $this->Flash->set(_txt('er.humanitiescommonsidpenroller.account.noconfig'), array('key' => 'error'));
@@ -223,6 +223,7 @@ protected function execute_plugin_checkEligibility($id, $onFinish) {
 
     // GET, fall through to display view
     ( $debug ? $this->log($logPrefix . "received GET so displaying form to collect username") : null);
+    $this->set('vv_efwid', $efwid);
   }
 
   /**
@@ -242,7 +243,7 @@ protected function execute_plugin_selectEnrollee($id, $onFinish) {
 
     $args = array();
     $args['conditions']['HumanitiesCommonsIdpEnroller.co_enrollment_flow_wedge_id'] = $efwid;
-    $args['contain']                                             = true;
+    $args['contain']                                             = false;
     $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,6 +33,7 @@
   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">