Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark...

[bookstack] / resources / views / pages / show.blade.php

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 011158dfbfd84440e92cd73dc4129b69809a0d97..6f221edee92b37be1fa361dd582cac883cfb148c 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -24,8 +24,10 @@
                         @if(userCanCreatePage())
                             <li><a href="{{ $page->getUrl('/copy') }}" class="text-primary" >@icon('copy'){{ trans('common.copy') }}</a></li>
                         @endif
-                        @if(userCan('page-update', $page))
+                        @if(userCan('page-delete', $page) && userCan('page-update, $page))
                             <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" >@icon('folder'){{ trans('common.move') }}</a></li>
+                        @endif
+                        @if(userCan('page-update', $page))
                             <li><a href="{{ $page->getUrl('/revisions') }}" class="text-primary">@icon('history'){{ trans('entities.revisions') }}</a></li>
                         @endif
                         @if(userCan('restrictions-manage', $page))