Skip to content
Snippets Groups Projects
Commit c03426f0 authored by srosse's avatar srosse
Browse files

OO-1314: gracefully survive the scaling of a none existing image, show a...

OO-1314: gracefully survive the scaling of a none existing image, show a warning with a message if the scaling of the image is not successful
parent ed1a9a88
No related branches found
No related tags found
No related merge requests found
...@@ -247,6 +247,9 @@ public class ImageHelperImpl extends AbstractImageHelper { ...@@ -247,6 +247,9 @@ public class ImageHelperImpl extends AbstractImageHelper {
*/ */
private ImageInputStream getInputStream(VFSLeaf leaf) private ImageInputStream getInputStream(VFSLeaf leaf)
throws IOException { throws IOException {
if(leaf == null) {
return null;
}
if(leaf instanceof LocalFileImpl) { if(leaf instanceof LocalFileImpl) {
LocalFileImpl file = (LocalFileImpl)leaf; LocalFileImpl file = (LocalFileImpl)leaf;
if(file.getBasefile() != null) { if(file.getBasefile() != null) {
......
...@@ -209,6 +209,8 @@ cif.error.description.empty=Bitte f\u00FCllen Sie das Feld "Beschreibung" aus. ...@@ -209,6 +209,8 @@ cif.error.description.empty=Bitte f\u00FCllen Sie das Feld "Beschreibung" aus.
cif.error.displayname.empty=Bitte f\u00FCllen Sie das Feld "Titel der Lernressource" aus. cif.error.displayname.empty=Bitte f\u00FCllen Sie das Feld "Titel der Lernressource" aus.
cif.error.idnotint=Diese Identifikationsnummer existiert nicht. cif.error.idnotint=Diese Identifikationsnummer existiert nicht.
cif.error.resourcename.empty=Bitte f\u00FCllen Sie das Feld "Referenz" aus. cif.error.resourcename.empty=Bitte f\u00FCllen Sie das Feld "Referenz" aus.
cif.error.image=Das Titelbild knnte nicht richtig gespeichert werden.
cif.error.movie=Der Teaser-Film knnte nicht richtig gespeichert werden.
cif.expenditureOfWork=Zeitaufwand cif.expenditureOfWork=Zeitaufwand
cif.externalid=Extern ID cif.externalid=Extern ID
cif.externalref=Kennzeichen cif.externalref=Kennzeichen
......
...@@ -466,7 +466,7 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -466,7 +466,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
VFSLeaf newFile = fileUpload.moveUploadFileTo(container);//give it it's real name and extension VFSLeaf newFile = fileUpload.moveUploadFileTo(container);//give it it's real name and extension
boolean ok = repositoryManager.setImage(newFile, repositoryEntry); boolean ok = repositoryManager.setImage(newFile, repositoryEntry);
if (!ok) { if (!ok) {
showError("Failed"); showWarning("cif.error.image");
} else { } else {
VFSLeaf image = repositoryManager.getImage(repositoryEntry); VFSLeaf image = repositoryManager.getImage(repositoryEntry);
if(image instanceof LocalFileImpl) { if(image instanceof LocalFileImpl) {
...@@ -481,7 +481,7 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -481,7 +481,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
VFSContainer m = (VFSContainer)mediaContainer.resolve("media"); VFSContainer m = (VFSContainer)mediaContainer.resolve("media");
VFSLeaf newFile = movieUpload.moveUploadFileTo(m); VFSLeaf newFile = movieUpload.moveUploadFileTo(m);
if (newFile == null) { if (newFile == null) {
showError("Failed"); showWarning("cif.error.movie");
} else { } else {
String filename = movieUpload.getUploadFileName(); String filename = movieUpload.getUploadFileName();
String extension = FileUtils.getFileSuffix(filename); String extension = FileUtils.getFileSuffix(filename);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment