diff --git a/data/db.mv.db b/data/db.mv.db deleted file mode 100644 index 52ce82b..0000000 Binary files a/data/db.mv.db and /dev/null differ diff --git a/src/main/java/ru/ulstu/news/NewsService.java b/src/main/java/ru/ulstu/news/NewsService.java index b108a3a..8c3d016 100644 --- a/src/main/java/ru/ulstu/news/NewsService.java +++ b/src/main/java/ru/ulstu/news/NewsService.java @@ -39,15 +39,18 @@ public class NewsService { public void save(News news) throws IOException { String fileName = System.currentTimeMillis() + ""; - news.setImageFileName(fileName); + if (!news.getImageFile().isEmpty()) { + news.setImageFileName(fileName); + FileUtil.saveFile(FileSystemStorageService.UPLOAD_DIR, fileName, news.getImageFile()); + } else { + news.setImageFileName(news.getImageFileName().isEmpty() ? "logo.png" : news.getImageFileName()); + } if (news.getId() != null && (news.getId() != 0)) { newsRepository.save(news); } else { create(news); } - - FileUtil.saveFile(FileSystemStorageService.UPLOAD_DIR, fileName, news.getImageFile()); } public News getById(@NotNull Integer id) { diff --git a/src/main/resources/templates/editNews.html b/src/main/resources/templates/editNews.html index d448036..3a4eade 100644 --- a/src/main/resources/templates/editNews.html +++ b/src/main/resources/templates/editNews.html @@ -14,6 +14,7 @@ +