Bläddra i källkod

bugfix email list

andre 3 månader sedan
förälder
incheckning
d84a09d2ad

+ 7 - 5
app/UI/Client/DistributionList/Providers/EditListDataProvider.php

@@ -199,11 +199,13 @@ class EditListDataProvider extends AddListDataProvider
         $paramsSet['posting']['memberPosting'] = $this->formData['memberPosting'];
         $paramsSet['posting']['memberPosting'] = $this->formData['memberPosting'];
         $paramsSet['posting']['nonMemberPosting'] = $this->formData['nonMemberPosting'];
         $paramsSet['posting']['nonMemberPosting'] = $this->formData['nonMemberPosting'];
         $paramsSet['posting']['sendErrorsToModerator'] = $this->formData['sendErrorsToModerator'] === 'on' ? true : false;
         $paramsSet['posting']['sendErrorsToModerator'] = $this->formData['sendErrorsToModerator'] === 'on' ? true : false;
+
+        $oldMembers = $this->formData['memberListActually'] ?? [];
         // find new internal members to add
         // find new internal members to add
         $addIntMembers = array();
         $addIntMembers = array();
-        if(!empty($this->formData['memberListActually'])) {
+        if(!empty($this->formData['memberList'])){
             foreach($this->formData['memberList'] as $intMember) {
             foreach($this->formData['memberList'] as $intMember) {
-                if(!in_array($intMember, $this->formData['memberListActually'])) {
+                if(!in_array($intMember, $oldMembers)) {
                     array_push($addIntMembers, $intMember);
                     array_push($addIntMembers, $intMember);
                 }
                 }
             }
             }
@@ -223,7 +225,7 @@ class EditListDataProvider extends AddListDataProvider
         if(!empty($this->formData['customMember'])){
         if(!empty($this->formData['customMember'])){
             $customMembers = explode(',',$this->formData['customMember']);
             $customMembers = explode(',',$this->formData['customMember']);
             foreach($customMembers as $extMember) {
             foreach($customMembers as $extMember) {
-                if(!in_array($extMember, $this->formData['memberListActually'])) {
+                if(!in_array($extMember, $oldMembers)) {
                     array_push($addExtMembers, $extMember);
                     array_push($addExtMembers, $extMember);
                 }
                 }
             }
             }
@@ -239,8 +241,8 @@ class EditListDataProvider extends AddListDataProvider
             }
             }
         }
         }
         // find members to remove
         // find members to remove
-        if(!empty($this->formData['memberListActually'])) {
-            foreach($this->formData['memberListActually'] as $oldMember) {
+        if(!empty($oldMembers)) {
+            foreach($oldMembers as $oldMember) {
                 if((!in_array($oldMember,$this->formData['memberList'])) && (!in_array($oldMember,$customMembers))){
                 if((!in_array($oldMember,$this->formData['memberList'])) && (!in_array($oldMember,$customMembers))){
                     $delMembers[] = $oldMember;
                     $delMembers[] = $oldMember;
                 }
                 }