kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fixed search in encrypted entries.

Browse Source
This commit is contained in:
James Cole
2015-03-20 18:21:14 +01:00
parent 4361cc69d4
commit 7ed662ecc2
4 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Middleware/Reminders.php
View File

@@ -9,7 +9,7 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Reminder;
use Illuminate\Contracts\Auth\Guard;
use View;
use Illuminate\Support\Collection;
/**
* Class Reminders
*
@@ -45,7 +45,7 @@ class Reminders
*/
public function handle($request, Closure $next)
{
if ($this->auth->check()) {
if ($this->auth->check() && !$request->isJson()) {
// do reminders stuff.
$piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get();
$today = new Carbon;
@@ -67,15 +67,14 @@ class Reminders
}
}
// delete invalid reminders
$reminders = $this->auth->user()->reminders()->get();
foreach($reminders as $reminder) {
if(is_null($reminder->remindersable)) {
$reminder->delete();
}
$set = $this->auth->user()->reminders()->
leftJoin('piggy_banks','piggy_banks.id','=','remindersable_id')->
whereNull('piggy_banks.id')->get(['reminders.id']);
foreach($set as $reminder) {
$reminder->delete();
}
// get and list active reminders:
$reminders = $this->auth->user()->reminders()->today()->get();
$reminders->each(
@@ -86,6 +85,7 @@ class Reminders
View::share('reminders', $reminders);
}
return $next($request);
}
}