IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

More friendly demo user message.

Browse Source
This commit is contained in:
James Cole 2018-01-25 19:02:14 +01:00
parent c86c5ccfe9
commit 49a95a08fe
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Import/ConfigurationController.php
View File

@ -55,6 +55,7 @@ class ConfigurationController extends Controller
return $next($request); return $next($request);
} }
); );
$this->middleware(IsDemoUser::class);
} }
/** /**

2
app/Http/Controllers/Import/IndexController.php
View File

@ -33,6 +33,7 @@ use Log;
use Response; use Response;
use View; use View;
/** /**
* Class FileController. * Class FileController.
*/ */
@ -57,6 +58,7 @@ class IndexController extends Controller
return $next($request); return $next($request);
} }
); );
$this->middleware(IsDemoUser::class)->except(['index']);
} }
/** /**

1
app/Http/Controllers/Import/PrerequisitesController.php
View File

@ -50,6 +50,7 @@ class PrerequisitesController extends Controller
return $next($request); return $next($request);
} }
); );
$this->middleware(IsDemoUser::class);
} }
/** /**

8
app/Http/Controllers/Import/StatusController.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Import; namespace FireflyIII\Http\Controllers\Import;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Models\ImportJob; use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Response; use Response;
@ -47,6 +48,7 @@ class StatusController extends Controller
return $next($request); return $next($request);
} }
); );
$this->middleware(IsDemoUser::class);
} }
/** /**
@ -100,8 +102,10 @@ class StatusController extends Controller
/** @var TagRepositoryInterface $repository */ /** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class); $repository = app(TagRepositoryInterface::class);
$tag = $repository->find($tagId); $tag = $repository->find($tagId);
$count = $tag->transactionJournals()->count(); $count = $tag->transactionJournals()->count();
$result['finishedText'] = trans('import.status_finished_job', ['count' => $count,'link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]); $result['finishedText'] = trans(
'import.status_finished_job', ['count' => $count, 'link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]
);
} }
if ($tagId === 0) { if ($tagId === 0) {

4
app/Http/Middleware/IsDemoUser.php
View File

@ -51,9 +51,9 @@ class IsDemoUser
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
if ($user->hasRole('demo')) { if ($user->hasRole('demo')) {
Session::flash('warning', strval(trans('firefly.not_available_demo_user'))); Session::flash('info', strval(trans('firefly.not_available_demo_user')));
return redirect(route('index')); return redirect($request->session()->previousUrl());
} }
return $next($request); return $next($request);