github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-25 00:00:00 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into add_role_view_permissions

Browse Source
This commit is contained in:
Dan Brown
2016-04-20 20:22:30 +01:00
parent 6e03078de3 8b36ca95a3
commit 043cdeafb3
74 changed files with 262 additions and 5600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/PageController.php
View File

@ -4,6 +4,7 @@ use Activity;
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;
@ -216,8 +217,14 @@ class PageController extends Controller
} 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
]);
}
/**