Localised draft save time display

In reference to #83.

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index e250d8c8539f2f2bfe0b064d88c423f805a4e454..a645ede025077543f5676c4c225f8ac47c93c432 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -4,6 +4,7 @@ use Activity;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;

+use Carbon\Carbon;

 use Illuminate\Http\Request;
 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;
 use Illuminate\Http\Request;
 use BookStack\Http\Requests;
 use BookStack\Repos\BookRepo;


@@ -214,8 +215,14 @@ class PageController extends Controller
         } else {
             $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown']));
         }
         } else {
             $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown']));
         }

-        $updateTime = $draft->updated_at->format('H:i');
-        return response()->json(['status' => 'success', 'message' => 'Draft saved at ' . $updateTime]);
+
+        $updateTime = $draft->updated_at->timestamp;
+        $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;
+        return response()->json([
+            'status' => 'success',
+            'message' => 'Draft saved at ',
+            'timestamp' => $utcUpdateTimestamp
+        ]);

     }
 
     /**
     }
 
     /**

diff --git a/package.json b/package.json
index 7d1aa1a6a2b1716dbb4f86dae26f29a086315260..866109c2a7eaff5e476cf7949731520f2703e1ff 100644 (file)
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "dropzone": "^4.0.1",
     "laravel-elixir": "^3.4.0",
     "marked": "^0.3.5",
     "dropzone": "^4.0.1",
     "laravel-elixir": "^3.4.0",
     "marked": "^0.3.5",

+    "moment": "^2.12.0",

     "zeroclipboard": "^2.2.0"
   }
 }
     "zeroclipboard": "^2.2.0"
   }
 }

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index 83e58ee4b81df2c9f917433b73c0482754a76838..340a0f1a119a52a69eb224aacbb1bf3ec88a04cf 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -1,5 +1,7 @@
 "use strict";
 
 "use strict";
 

+var moment = require('moment');
+

 module.exports = function (ngApp, events) {
 
     ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
 module.exports = function (ngApp, events) {
 
     ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',


@@ -367,7 +369,8 @@ module.exports = function (ngApp, events) {
             if (isMarkdown) data.markdown = $scope.editContent;
 
             $http.put('/ajax/page/' + pageId + '/save-draft', data).then((responseData) => {
             if (isMarkdown) data.markdown = $scope.editContent;
 
             $http.put('/ajax/page/' + pageId + '/save-draft', data).then((responseData) => {

-                $scope.draftText = responseData.data.message;
+                var updateTime = moment.utc(moment.unix(responseData.data.timestamp)).toDate();
+                $scope.draftText = responseData.data.message + moment(updateTime).format('H:m');

                 if (!$scope.isNewPageDraft) $scope.isUpdateDraft = true;
             });
         }
                 if (!$scope.isNewPageDraft) $scope.isUpdateDraft = true;
             });
         }