mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-25 19:56:05 +00:00
Merge bugfixes from branch 'v0.14'
This commit is contained in:
commit
a6128a1df1
@ -13,6 +13,8 @@ class Kernel extends HttpKernel
|
|||||||
*/
|
*/
|
||||||
protected $middleware = [
|
protected $middleware = [
|
||||||
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
|
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
|
||||||
|
\Illuminate\Session\Middleware\StartSession::class,
|
||||||
|
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -24,8 +26,6 @@ class Kernel extends HttpKernel
|
|||||||
'web' => [
|
'web' => [
|
||||||
\BookStack\Http\Middleware\EncryptCookies::class,
|
\BookStack\Http\Middleware\EncryptCookies::class,
|
||||||
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
||||||
\Illuminate\Session\Middleware\StartSession::class,
|
|
||||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
|
||||||
\BookStack\Http\Middleware\VerifyCsrfToken::class,
|
\BookStack\Http\Middleware\VerifyCsrfToken::class,
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
\BookStack\Http\Middleware\Localization::class
|
\BookStack\Http\Middleware\Localization::class
|
||||||
|
@ -37,6 +37,15 @@ function user()
|
|||||||
return auth()->user() ?: \BookStack\User::getDefault();
|
return auth()->user() ?: \BookStack\User::getDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if current user is a signed in user.
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
function signedInUser()
|
||||||
|
{
|
||||||
|
return auth()->user() && !auth()->user()->isDefault();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the current user has a permission.
|
* Check if the current user has a permission.
|
||||||
* If an ownable element is passed in the jointPermissions are checked against
|
* If an ownable element is passed in the jointPermissions are checked against
|
||||||
|
@ -55,15 +55,15 @@
|
|||||||
<div class="float right">
|
<div class="float right">
|
||||||
<div class="links text-center">
|
<div class="links text-center">
|
||||||
<a href="{{ baseUrl('/books') }}"><i class="zmdi zmdi-book"></i>{{ trans('entities.books') }}</a>
|
<a href="{{ baseUrl('/books') }}"><i class="zmdi zmdi-book"></i>{{ trans('entities.books') }}</a>
|
||||||
@if(isset($currentUser) && userCan('settings-manage'))
|
@if(signedInUser() && userCan('settings-manage'))
|
||||||
<a href="{{ baseUrl('/settings') }}"><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a>
|
<a href="{{ baseUrl('/settings') }}"><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a>
|
||||||
@endif
|
@endif
|
||||||
@if(!isset($signedIn) || !$signedIn)
|
@if(!signedInUser())
|
||||||
<a href="{{ baseUrl('/login') }}"><i class="zmdi zmdi-sign-in"></i>{{ trans('auth.log_in') }}</a>
|
<a href="{{ baseUrl('/login') }}"><i class="zmdi zmdi-sign-in"></i>{{ trans('auth.log_in') }}</a>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@if(isset($signedIn) && $signedIn)
|
@if(signedInUser())
|
||||||
@include('partials._header-dropdown', ['currentUser' => $currentUser])
|
@include('partials._header-dropdown', ['currentUser' => user()])
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -10,22 +10,24 @@
|
|||||||
<p>{{ trans('errors.sorry_page_not_found') }}</p>
|
<p>{{ trans('errors.sorry_page_not_found') }}</p>
|
||||||
<p><a href="{{ baseUrl('/') }}" class="button">{{ trans('errors.return_home') }}</a></p>
|
<p><a href="{{ baseUrl('/') }}" class="button">{{ trans('errors.return_home') }}</a></p>
|
||||||
|
|
||||||
<hr>
|
@if (setting('app-public') || !user()->isDefault())
|
||||||
|
<hr>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<h3 class="text-muted">{{ trans('entities.pages_popular') }}</h3>
|
<h3 class="text-muted">{{ trans('entities.pages_popular') }}</h3>
|
||||||
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
|
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<h3 class="text-muted">{{ trans('entities.books_popular') }}</h3>
|
||||||
|
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<h3 class="text-muted">{{ trans('entities.chapters_popular') }}</h3>
|
||||||
|
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
@endif
|
||||||
<h3 class="text-muted">{{ trans('entities.books_popular') }}</h3>
|
|
||||||
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
|
|
||||||
</div>
|
|
||||||
<div class="col-md-4">
|
|
||||||
<h3 class="text-muted">{{ trans('entities.chapters_popular') }}</h3>
|
|
||||||
@include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@stop
|
@stop
|
@ -80,4 +80,14 @@ class PublicActionTest extends BrowserKitTest
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_content_not_listed_on_404_for_public_users()
|
||||||
|
{
|
||||||
|
$page = \BookStack\Page::first();
|
||||||
|
$this->asAdmin()->visit($page->getUrl());
|
||||||
|
Auth::logout();
|
||||||
|
view()->share('pageTitle', '');
|
||||||
|
$this->forceVisit('/cats/dogs/hippos');
|
||||||
|
$this->dontSee($page->name);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user