Merge branch 'develop' of bitbucket.org:unicon/comanagework into develop

Ioannis · Jan 29, 2021 · 96b92f0 · 96b92f0
2 parents 4fb1274 + 0b21dbb
commit 96b92f0
Showing 10 changed files with 644 additions and 159 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -99,7 +99,20 @@ public function groupOptin() {
       $this->set('groupergroupoptin', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOptin'));
       $this->set('searchcriteria', $searchCriteria);
     } else {
-      $this->set('groupergroupoptin', $this->GrouperGroup->optinGroups($this->userId));
+      try {
+        $optin = $this->GrouperGroup->optinGroups($this->userId);
+        if (isset($optin['errorMessage'])){
+          $this->Flash->error($optin['errorMessage']);
+          $this->set('groupergroupoptin', array());
+        } else {
+          $this->set('groupergroupoptin', $optin);
+        }
+
+      } catch (Exception $e) {
+        CakeLog::write('error', 'GrouperLite Controller: Seeing is believing');
+        $this->Flash->error($e->getMessage());
+        $this->set('groupergroupoptin', array());
+      }
     }
   }