Merge pull request #809 from Patriboom/master

Correction aux requetes WhereNotIn
pixeline · Jul 27, 2022 · 9b6e759 · 9b6e759
2 parents 2d9fe65 + d4ad496
commit 9b6e759
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 4 deletions.
diff --git a/app/application/config/tinyissue.php b/app/application/config/tinyissue.php
@@ -1,6 +1,6 @@
 <?php
 return array(
-	'release_date' => '26-07-2022',
+	'release_date' => '27-07-2022',
 	'version' => '1.9',
-	'release' => '1b'
+	'release' => '1b_b'
 );
diff --git a/app/application/libraries/mail.php b/app/application/libraries/mail.php
@@ -135,7 +135,7 @@ public static function letMailIt ($details, $UserID = 0, $Langue = NULL) {
 				->where('users.email', '<>', '')
 				->whereNotNull('users.email')
 				->where('following.issue_id', '=', $detail['IssueID'])
-				->whereNotIn('following.user_id', (($detail['Type'] == 'Issue' && $detail['SkipUser']) ? array($UserID) : array(0)))
+				->where_not_in('following.user_id', (($detail['Type'] == 'Issue' && $detail['SkipUser']) ? array($UserID) : array(0)))
 				->where('following.project', '=', (($detail['Type'] == 'Issue') ? 0 : 1 ))
 				->order_by('users.id')
 				->get();

diff --git a/app/application/models/project.php b/app/application/models/project.php
@@ -71,7 +71,7 @@ public function users_not_in() {
 
 		foreach($this->users()->get(array('user_id')) as $user) { $users[] = $user->id; }
 		$results = User::where('deleted', '=', 0);
-		if(count($users) > 0) { $results->whereNotIn('id', $users); }
+		if(count($users) > 0) { $results->where_not_in('id', $users); }
 
 		return $results->get();
 	}

diff --git a/app/assets/images/screenshots/BUGS_Login.png b/app/assets/images/screenshots/BUGS_Login.png
diff --git a/app/assets/images/screenshots/Tickets_AcceptedTask_dashboard.png b/app/assets/images/screenshots/Tickets_AcceptedTask_dashboard.png
diff --git a/app/assets/images/screenshots/Tickets_Calendar_grid.png b/app/assets/images/screenshots/Tickets_Calendar_grid.png
diff --git a/app/assets/images/screenshots/Tickets_Calendar_list.png b/app/assets/images/screenshots/Tickets_Calendar_list.png
diff --git a/app/assets/images/screenshots/Tickets_Canevas.png b/app/assets/images/screenshots/Tickets_Canevas.png
diff --git a/app/assets/images/screenshots/Tickets_Canevas_Sombre_Bleu.png b/app/assets/images/screenshots/Tickets_Canevas_Sombre_Bleu.png
diff --git a/app/assets/images/screenshots/Tickets_Canevas_Sombre_Rouge.png b/app/assets/images/screenshots/Tickets_Canevas_Sombre_Rouge.png
diff --git a/app/assets/images/screenshots/Tickets_Canevas_Sombre_Vert.png b/app/assets/images/screenshots/Tickets_Canevas_Sombre_Vert.png