mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-25 19:56:05 +00:00
Fixed attachment base-url usage and non-existant images
Images now self-delete if the original file does not exist. Prevents simply getting non-fixable errors. Also cleaned some JS.
This commit is contained in:
parent
ac80723058
commit
672b15d36c
@ -5,6 +5,7 @@ use BookStack\Image;
|
|||||||
use BookStack\Page;
|
use BookStack\Page;
|
||||||
use BookStack\Services\ImageService;
|
use BookStack\Services\ImageService;
|
||||||
use BookStack\Services\PermissionService;
|
use BookStack\Services\PermissionService;
|
||||||
|
use Illuminate\Contracts\Filesystem\FileNotFoundException;
|
||||||
use Setting;
|
use Setting;
|
||||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||||
|
|
||||||
@ -191,7 +192,12 @@ class ImageRepo
|
|||||||
*/
|
*/
|
||||||
public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
|
public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
|
||||||
{
|
{
|
||||||
return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
|
try {
|
||||||
|
return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
|
||||||
|
} catch (FileNotFoundException $exception) {
|
||||||
|
$image->delete();
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ class PageRepo extends EntityRepo
|
|||||||
* Get a page identified by the given slug.
|
* Get a page identified by the given slug.
|
||||||
* @param $slug
|
* @param $slug
|
||||||
* @param $bookId
|
* @param $bookId
|
||||||
* @return mixed
|
* @return Page
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
*/
|
*/
|
||||||
public function getBySlug($slug, $bookId)
|
public function getBySlug($slug, $bookId)
|
||||||
|
@ -4,7 +4,7 @@ import moment from 'moment';
|
|||||||
import 'moment/locale/en-gb';
|
import 'moment/locale/en-gb';
|
||||||
moment.locale('en-gb');
|
moment.locale('en-gb');
|
||||||
|
|
||||||
module.exports = function (ngApp, events) {
|
export default function (ngApp, events) {
|
||||||
|
|
||||||
ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
|
ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
|
||||||
function ($scope, $attrs, $http, $timeout, imageManagerService) {
|
function ($scope, $attrs, $http, $timeout, imageManagerService) {
|
||||||
@ -164,7 +164,6 @@ module.exports = function (ngApp, events) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Start a search operation
|
* Start a search operation
|
||||||
* @param searchTerm
|
|
||||||
*/
|
*/
|
||||||
$scope.searchImages = function() {
|
$scope.searchImages = function() {
|
||||||
|
|
||||||
@ -198,7 +197,7 @@ module.exports = function (ngApp, events) {
|
|||||||
$scope.view = viewName;
|
$scope.view = viewName;
|
||||||
baseUrl = window.baseUrl('/images/' + $scope.imageType + '/' + viewName + '/');
|
baseUrl = window.baseUrl('/images/' + $scope.imageType + '/' + viewName + '/');
|
||||||
fetchData();
|
fetchData();
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save the details of an image.
|
* Save the details of an image.
|
||||||
@ -207,7 +206,7 @@ module.exports = function (ngApp, events) {
|
|||||||
$scope.saveImageDetails = function (event) {
|
$scope.saveImageDetails = function (event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
|
var url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
|
||||||
$http.put(url, this.selectedImage).then((response) => {
|
$http.put(url, this.selectedImage).then(response => {
|
||||||
events.emit('success', 'Image details updated');
|
events.emit('success', 'Image details updated');
|
||||||
}, (response) => {
|
}, (response) => {
|
||||||
if (response.status === 422) {
|
if (response.status === 422) {
|
||||||
@ -306,12 +305,12 @@ module.exports = function (ngApp, events) {
|
|||||||
$scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1;
|
$scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1;
|
||||||
$scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1;
|
$scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1;
|
||||||
|
|
||||||
// Set inital header draft text
|
// Set initial header draft text
|
||||||
if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
|
if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
|
||||||
$scope.draftText = 'Editing Draft'
|
$scope.draftText = 'Editing Draft'
|
||||||
} else {
|
} else {
|
||||||
$scope.draftText = 'Editing Page'
|
$scope.draftText = 'Editing Page'
|
||||||
};
|
}
|
||||||
|
|
||||||
var autoSave = false;
|
var autoSave = false;
|
||||||
|
|
||||||
@ -571,7 +570,7 @@ module.exports = function (ngApp, events) {
|
|||||||
if (newOrder === currentOrder) return;
|
if (newOrder === currentOrder) return;
|
||||||
|
|
||||||
currentOrder = newOrder;
|
currentOrder = newOrder;
|
||||||
$http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => {
|
$http.put(window.baseUrl(`/files/sort/page/${pageId}`), {files: $scope.files}).then(resp => {
|
||||||
events.emit('success', resp.data.message);
|
events.emit('success', resp.data.message);
|
||||||
}, checkError('sort'));
|
}, checkError('sort'));
|
||||||
}
|
}
|
||||||
@ -637,7 +636,7 @@ module.exports = function (ngApp, events) {
|
|||||||
file.deleting = true;
|
file.deleting = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$http.delete(`/files/${file.id}`).then(resp => {
|
$http.delete(window.baseUrl(`/files/${file.id}`)).then(resp => {
|
||||||
events.emit('success', resp.data.message);
|
events.emit('success', resp.data.message);
|
||||||
$scope.files.splice($scope.files.indexOf(file), 1);
|
$scope.files.splice($scope.files.indexOf(file), 1);
|
||||||
}, checkError('delete'));
|
}, checkError('delete'));
|
||||||
@ -645,12 +644,11 @@ module.exports = function (ngApp, events) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Attach a link to a page.
|
* Attach a link to a page.
|
||||||
* @param fileName
|
* @param file
|
||||||
* @param fileLink
|
|
||||||
*/
|
*/
|
||||||
$scope.attachLinkSubmit = function(file) {
|
$scope.attachLinkSubmit = function(file) {
|
||||||
file.uploaded_to = pageId;
|
file.uploaded_to = pageId;
|
||||||
$http.post('/files/link', file).then(resp => {
|
$http.post(window.baseUrl('/files/link'), file).then(resp => {
|
||||||
$scope.files.push(resp.data);
|
$scope.files.push(resp.data);
|
||||||
events.emit('success', 'Link attached');
|
events.emit('success', 'Link attached');
|
||||||
$scope.file = getCleanFile();
|
$scope.file = getCleanFile();
|
||||||
@ -659,10 +657,9 @@ module.exports = function (ngApp, events) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Start the edit mode for a file.
|
* Start the edit mode for a file.
|
||||||
* @param fileId
|
* @param file
|
||||||
*/
|
*/
|
||||||
$scope.startEdit = function(file) {
|
$scope.startEdit = function(file) {
|
||||||
console.log(file);
|
|
||||||
$scope.editFile = angular.copy(file);
|
$scope.editFile = angular.copy(file);
|
||||||
$scope.editFile.link = (file.external) ? file.path : '';
|
$scope.editFile.link = (file.external) ? file.path : '';
|
||||||
};
|
};
|
||||||
@ -679,7 +676,7 @@ module.exports = function (ngApp, events) {
|
|||||||
* @param file
|
* @param file
|
||||||
*/
|
*/
|
||||||
$scope.updateFile = function(file) {
|
$scope.updateFile = function(file) {
|
||||||
$http.put(`/files/${file.id}`, file).then(resp => {
|
$http.put(window.baseUrl(`/files/${file.id}`), file).then(resp => {
|
||||||
let search = filesIndexOf(resp.data);
|
let search = filesIndexOf(resp.data);
|
||||||
if (search !== -1) $scope.files[search] = resp.data;
|
if (search !== -1) $scope.files[search] = resp.data;
|
||||||
|
|
||||||
@ -696,7 +693,7 @@ module.exports = function (ngApp, events) {
|
|||||||
*/
|
*/
|
||||||
$scope.getFileUrl = function(file) {
|
$scope.getFileUrl = function(file) {
|
||||||
return window.baseUrl('/files/' + file.id);
|
return window.baseUrl('/files/' + file.id);
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search the local files via another file object.
|
* Search the local files via another file object.
|
||||||
@ -713,7 +710,7 @@ module.exports = function (ngApp, events) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Check for an error response in a ajax request.
|
* Check for an error response in a ajax request.
|
||||||
* @param response
|
* @param errorGroupName
|
||||||
*/
|
*/
|
||||||
function checkError(errorGroupName) {
|
function checkError(errorGroupName) {
|
||||||
$scope.errors[errorGroupName] = {};
|
$scope.errors[errorGroupName] = {};
|
||||||
|
@ -38,13 +38,17 @@ class EventManager {
|
|||||||
this.listeners[eventName].push(callback);
|
this.listeners[eventName].push(callback);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
window.Events = new EventManager();
|
window.Events = new EventManager();
|
||||||
|
|
||||||
|
// Load in angular specific items
|
||||||
var services = require('./services')(ngApp, window.Events);
|
import Services from './services';
|
||||||
var directives = require('./directives')(ngApp, window.Events);
|
import Directives from './directives';
|
||||||
var controllers = require('./controllers')(ngApp, window.Events);
|
import Controllers from './controllers';
|
||||||
|
Services(ngApp, window.Events);
|
||||||
|
Directives(ngApp, window.Events);
|
||||||
|
Controllers(ngApp, window.Events);
|
||||||
|
|
||||||
//Global jQuery Config & Extensions
|
//Global jQuery Config & Extensions
|
||||||
|
|
||||||
|
@ -6,11 +6,11 @@
|
|||||||
* @param editor - editor instance
|
* @param editor - editor instance
|
||||||
*/
|
*/
|
||||||
function editorPaste(e, editor) {
|
function editorPaste(e, editor) {
|
||||||
if (!e.clipboardData) return
|
if (!e.clipboardData) return;
|
||||||
let items = e.clipboardData.items;
|
let items = e.clipboardData.items;
|
||||||
if (!items) return;
|
if (!items) return;
|
||||||
for (let i = 0; i < items.length; i++) {
|
for (let i = 0; i < items.length; i++) {
|
||||||
if (items[i].type.indexOf("image") === -1) return
|
if (items[i].type.indexOf("image") === -1) return;
|
||||||
|
|
||||||
let file = items[i].getAsFile();
|
let file = items[i].getAsFile();
|
||||||
let formData = new FormData();
|
let formData = new FormData();
|
||||||
|
Loading…
Reference in New Issue
Block a user