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

OO-827: prevent red screen if the media is not available (only show it's missing)

parent 4869dadd
No related branches found
No related tags found
No related merge requests found
...@@ -1019,7 +1019,9 @@ public class FeedManagerImpl extends FeedManager { ...@@ -1019,7 +1019,9 @@ public class FeedManagerImpl extends FeedManager {
item = item.resolve(itemId); item = item.resolve(itemId);
item = item.resolve(MEDIA_DIR); item = item.resolve(MEDIA_DIR);
item = item.resolve(fileName); item = item.resolve(fileName);
mediaResource = new VFSMediaResource((VFSLeaf) item); if(item instanceof VFSLeaf) {
mediaResource = new VFSMediaResource((VFSLeaf)item);
}
} catch (NullPointerException e) { } catch (NullPointerException e) {
log.debug("Media resource could not be created from file: ", fileName); log.debug("Media resource could not be created from file: ", fileName);
} }
...@@ -1037,7 +1039,9 @@ public class FeedManagerImpl extends FeedManager { ...@@ -1037,7 +1039,9 @@ public class FeedManagerImpl extends FeedManager {
try { try {
VFSItem item = getFeedMediaContainer(feed); VFSItem item = getFeedMediaContainer(feed);
item = item.resolve(fileName); item = item.resolve(fileName);
mediaResource = new VFSMediaResource((VFSLeaf) item); if(item instanceof VFSLeaf) {
mediaResource = new VFSMediaResource((VFSLeaf)item);
}
} catch (NullPointerException e) { } catch (NullPointerException e) {
log.debug("Media resource could not be created from file: ", fileName); log.debug("Media resource could not be created from file: ", fileName);
} }
......
...@@ -218,11 +218,16 @@ class FeedFormController extends FormBasicController { ...@@ -218,11 +218,16 @@ class FeedFormController extends FormBasicController {
* @param newResource * @param newResource
*/ */
private void setImage(MediaResource newResource) { private void setImage(MediaResource newResource) {
if(newResource == null) {
unsetImage();
return;
}
image.setMediaResource(newResource); image.setMediaResource(newResource);
image.setMaxWithAndHeightToFitWithin(150, 150); image.setMaxWithAndHeightToFitWithin(150, 150);
imageContainer.setVisible(true); imageContainer.setVisible(true);
// This is needed. ImageContainer is not displayed otherwise. // This is needed. ImageContainer is not displayed otherwise.
this.getInitialComponent().setDirty(true); getInitialComponent().setDirty(true);
imageDeleted = false; imageDeleted = false;
file.setLabel(null, null); file.setLabel(null, null);
} }
......
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