Fixed attachments on draft pages

diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index b32162e7f5042d5bb1e53777a85ebc68ecc16eb0..62be0b852236f9109249e17834f32ae85ae7eaee 100644 (file)
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -40,7 +40,7 @@ class AttachmentController extends Controller
         ]);
 
         $pageId = $request->get('uploaded_to');
         ]);
 
         $pageId = $request->get('uploaded_to');

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageRepo->getById($pageId, true);

 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);
 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);


@@ -70,7 +70,7 @@ class AttachmentController extends Controller
         ]);
 
         $pageId = $request->get('uploaded_to');
         ]);
 
         $pageId = $request->get('uploaded_to');

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageRepo->getById($pageId, true);

         $attachment = $this->attachment->findOrFail($attachmentId);
 
         $this->checkOwnablePermission('page-update', $page);
         $attachment = $this->attachment->findOrFail($attachmentId);
 
         $this->checkOwnablePermission('page-update', $page);


@@ -106,7 +106,7 @@ class AttachmentController extends Controller
         ]);
 
         $pageId = $request->get('uploaded_to');
         ]);
 
         $pageId = $request->get('uploaded_to');

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageRepo->getById($pageId, true);

         $attachment = $this->attachment->findOrFail($attachmentId);
 
         $this->checkOwnablePermission('page-update', $page);
         $attachment = $this->attachment->findOrFail($attachmentId);
 
         $this->checkOwnablePermission('page-update', $page);


@@ -134,7 +134,7 @@ class AttachmentController extends Controller
         ]);
 
         $pageId = $request->get('uploaded_to');
         ]);
 
         $pageId = $request->get('uploaded_to');

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageRepo->getById($pageId, true);

 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);
 
         $this->checkPermission('attachment-create-all');
         $this->checkOwnablePermission('page-update', $page);


@@ -153,9 +153,9 @@ class AttachmentController extends Controller
      */
     public function listForPage($pageId)
     {
      */
     public function listForPage($pageId)
     {

-        $page = $this->pageRepo->getById($pageId);
+        $page = $this->pageRepo->getById($pageId, true);

         $this->checkOwnablePermission('page-view', $page);
         $this->checkOwnablePermission('page-view', $page);

-        return response()->json($page->files);
+        return response()->json($page->attachments);

     }
 
     /**
     }
 
     /**

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index e81061685a1ab3afc1d37a8fdb4fab78a4fe0987..9bad2e83d15aa2621b04ce27993124fe8dd7306b 100644 (file)
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -193,7 +193,7 @@ p.neg, p .neg, span.neg, .text-neg {
 p.muted, p .muted, span.muted, .text-muted {
        color: lighten($text-dark, 26%);
     &.small, .small {
 p.muted, p .muted, span.muted, .text-muted {
        color: lighten($text-dark, 26%);
     &.small, .small {

-      color: lighten($text-dark, 42%);
+      color: lighten($text-dark, 32%);

     }
 }
 
     }
 }
 

diff --git a/resources/views/pages/form-toolbox.blade.php b/resources/views/pages/form-toolbox.blade.php
index 0ca8a311b672738058820cab77292eab675cae96..a6e66a24a13f3e778924634faea57ce4af24fd69 100644 (file)
--- a/resources/views/pages/form-toolbox.blade.php
+++ b/resources/views/pages/form-toolbox.blade.php
@@ -43,11 +43,11 @@
             <div class="padded files">
 
                 <div id="file-list" ng-show="!editFile">
             <div class="padded files">
 
                 <div id="file-list" ng-show="!editFile">

-                    <p class="muted small">Upload some files or attach some link to display on your page. This are visible in the page sidebar.</p>
+                    <p class="muted small">Upload some files or attach some link to display on your page. These are visible in the page sidebar. <span class="secondary">Changes here are saved instantly.</span></p>

 
                     <div tab-container>
                         <div class="nav-tabs">
 
                     <div tab-container>
                         <div class="nav-tabs">

-                            <div tab-button="list" class="tab-item">File List</div>
+                            <div tab-button="list" class="tab-item">Attached Items</div>

                             <div tab-button="file" class="tab-item">Upload File</div>
                             <div tab-button="link" class="tab-item">Attach Link</div>
                         </div>
                             <div tab-button="file" class="tab-item">Upload File</div>
                             <div tab-button="link" class="tab-item">Attach Link</div>
                         </div>