From: Dan Brown <redacted>
Date: Sat, 9 Mar 2019 16:12:12 +0000 (+0000)
Subject: Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark... 
X-Git-Tag: v0.25.2~1^2~2^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6be2d3f28c2d59987dba8b2b38714a7b9aae7c6b

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

6be2d3f28c2d59987dba8b2b38714a7b9aae7c6b
diff --cc resources/views/pages/show.blade.php
index afe007d45,011158dfb..6f221edee
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@@ -21,11 -21,11 +21,13 @@@
                  <div dropdown class="dropdown-container">
                      <a dropdown-toggle class="text-primary text-button">@icon('more') {{ trans('common.more') }}</a>
                      <ul>
-                         @if(userCan('page-update', $page))
+                         @if(userCanCreatePage())
                              <li><a href="{{ $page->getUrl('/copy') }}" class="text-primary" >@icon('copy'){{ trans('common.copy') }}</a></li>
-                             @if(userCan('page-delete', $page))
-                                 <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" >@icon('folder'){{ trans('common.move') }}</a></li>
-                             @endif
+                         @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))