Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 12:44:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable non-admin users with view all permissions to use the reports

Browse Source
This commit is contained in:
Hillel Coren 2017-02-07 17:23:55 +02:00
parent 314b5f8a57
commit 412d935e79
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ReportController.php
View File

@ -48,6 +48,10 @@ class ReportController extends BaseController
*/ */
public function showReports() public function showReports()
{ {
if (! Auth::user()->hasPermission('view_all')) {
return redirect('/');
}
$action = Input::get('action'); $action = Input::get('action');
if (Input::get('report_type')) { if (Input::get('report_type')) {
@ -118,6 +122,10 @@ class ReportController extends BaseController
*/ */
private function export($reportType, $data, $columns, $totals) private function export($reportType, $data, $columns, $totals)
{ {
if (! Auth::user()->hasPermission('view_all')) {
exit;
}
$output = fopen('php://output', 'w') or Utils::fatalError(); $output = fopen('php://output', 'w') or Utils::fatalError();
$reportType = trans("texts.{$reportType}s"); $reportType = trans("texts.{$reportType}s");
$date = date('Y-m-d'); $date = date('Y-m-d');

5
app/Http/routes.php
View File

@ -216,6 +216,9 @@ Route::group(['middleware' => 'auth:user'], function () {
Route::get('bluevine/hide_message', 'BlueVineController@hideMessage'); Route::get('bluevine/hide_message', 'BlueVineController@hideMessage');
Route::get('bluevine/completed', 'BlueVineController@handleCompleted'); Route::get('bluevine/completed', 'BlueVineController@handleCompleted');
Route::get('white_label/hide_message', 'NinjaController@hideWhiteLabelMessage'); Route::get('white_label/hide_message', 'NinjaController@hideWhiteLabelMessage');
Route::get('reports', 'ReportController@showReports');
Route::post('reports', 'ReportController@showReports');
}); });
Route::group([ Route::group([
@ -244,8 +247,6 @@ Route::group([
Route::post('settings/email_settings', 'AccountController@saveEmailSettings'); Route::post('settings/email_settings', 'AccountController@saveEmailSettings');
Route::get('company/{section}/{subSection?}', 'AccountController@redirectLegacy'); Route::get('company/{section}/{subSection?}', 'AccountController@redirectLegacy');
Route::get('settings/data_visualizations', 'ReportController@d3'); Route::get('settings/data_visualizations', 'ReportController@d3');
Route::get('reports', 'ReportController@showReports');
Route::post('reports', 'ReportController@showReports');
Route::post('settings/change_plan', 'AccountController@changePlan'); Route::post('settings/change_plan', 'AccountController@changePlan');
Route::post('settings/cancel_account', 'AccountController@cancelAccount'); Route::post('settings/cancel_account', 'AccountController@cancelAccount');

2
resources/views/header.blade.php
View File

@ -521,7 +521,7 @@
]) ])
@endforeach @endforeach
@endif @endif
@if (Auth::user()->is_admin) @if (Auth::user()->hasPermission('view_all'))
@include('partials.navigation_option', ['option' => 'reports']) @include('partials.navigation_option', ['option' => 'reports'])
@endif @endif
@include('partials.navigation_option', ['option' => 'settings']) @include('partials.navigation_option', ['option' => 'settings'])