Merge pull request #1045 from proditis/master

dont notify owner and redir to index

Author: proditis

frontend/modules/team/controllers/DefaultController.php

@@ -357,7 +357,7 @@ public function actionReject($id)
       if($tp->player_id!==Yii::$app->user->id && $tp->team_id!==Yii::$app->user->identity->teamLeader->id)
       {
         Yii::$app->session->setFlash('error', \Yii::t('app','You have no permission to cancel this membership.'));
-        return $this->redirect(['view','token'=>$token]);
+        return $this->redirect(['index']);
       }
 
       if($tp->delete()===false)
@@ -371,8 +371,8 @@ public function actionReject($id)
         if(Yii::$app->user->identity->teamLeader)
         {
           $this->delete_with_extras();
-          $redir=['index'];
         }
+        $redir=['index'];
         Yii::$app->db->createCommand("CALL repopulate_team_stream(:tid)")->bindValue(':tid',$tp->team_id)->execute();
         Yii::$app->session->setFlash('success', \Yii::t('app','Your membership has been withdrawn.'));
       }

frontend/modules/team/models/TeamPlayer.php

@@ -107,6 +107,8 @@ public function notifyPartOwner()
 
     public function notifyRejectPlayer()
     {
+      // Don't notify the players for deleting their own team
+      if($this->player_id===$this->team->owner_id) return;
       $msg=\Yii::t('app','Hi there, your team membership got rejected. Find another team to join.');
       return $this->sendNotification($this->player_id,$msg);
     }