fix(post): solve errors

Author: sergio11

src/main/java/controllers/admin/PostController.java

@@ -34,7 +34,6 @@
 import services.security.CurrentUser;
 import services.security.CurrentUserAttached;
 import projection.PostByAuthor;
-import projection.PostDetail;
 /**
  *
  * @author sergio
@@ -60,7 +59,7 @@ public String all(@CurrentUser User activeUser, Model model){
 
     @GetMapping("/edit/{postId}")
     public String showUpdatePostForm(@PathVariable Long postId, Model model) {
-        PostDetail post = postService.findById(postId);
+        Post post = postService.findById(postId);
         if (post == null) {
             throw new PostNotFoundException();
         }
@@ -70,7 +69,7 @@ public String showUpdatePostForm(@PathVariable Long postId, Model model) {
 
     @GetMapping("/delete/{postId}")
     public String showDeletePostForm(@PathVariable Long postId, Model model) {
-        PostDetail post = postService.findById(postId);
+        Post post = postService.findById(postId);
         if (post == null) {
             throw new PostNotFoundException();
         }
@@ -101,16 +100,25 @@ public String processPost(@RequestPart("postImage") MultipartFile postImage, @Mo
             return "admin/post/create";
         }
 
-        if(postImage != null){
+        if(postImage != null && !postImage.isEmpty()){
+            logger.info("Añadiendo información de la imagen");
             FileImage image = new FileImage();
             image.setName(postImage.getName());
             image.setContentType(postImage.getContentType());
             image.setSize(postImage.getSize());
             image.setContent(postImage.getBytes());
             post.setImage(image);
         }
+        
         post.setAuthor(activeUser);
-        postService.create(post);
+        if(post.getId() == null){
+            logger.info("Creando Nuevo Post");
+            postService.create(post);
+        }else{
+            logger.info("Editando Post");
+            postService.edit(post);
+        }
+        
         List<String> successMessages = new ArrayList();
         successMessages.add(messageSource.getMessage("message.post.save.success", new Object[] {post.getId()}, Locale.getDefault()));
         model.addFlashAttribute("successFlashMessages", successMessages);        

src/main/java/repositories/PostRepository.java

@@ -10,7 +10,7 @@
 
 public interface PostRepository extends JpaRepository<Post, Long> {
     PostDetail findByIdAndPublishedTrue(Long id);
-    PostDetail findById(Long id);
+    Post findById(Long id);
     List<PostSummary> findFirst5ByPublishedTrueOrderByDateDesc();
     List<PostByAuthor> findByAuthorId(Long id);
 }

src/main/java/services/PostService.java

@@ -20,7 +20,7 @@ public interface PostService {
     List<Post> findAll();
     List<PostSummary> findLatest5();
     List<PostByAuthor> findPostsByAuthor(Long id);
-    PostDetail findById(Long id);
+    Post findById(Long id);
     PostDetail findByIdAndPublishedTrue(Long id);
     Post create(Post post);
     Post edit(Post post);

src/main/java/services/PostServiceImpl.java

@@ -64,7 +64,7 @@ public List<PostByAuthor> findPostsByAuthor(Long id) {
     }
 
     @Override
-    public PostDetail findById(Long id) {
+    public Post findById(Long id) {
         return postRepository.findById(id);
     }
 

src/main/webapp/WEB-INF/i18n/messages.properties

@@ -1,6 +1,18 @@
 # To change this license header, choose License Headers in Project Properties.
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
+###### Titles #########
+admin.home.title = Adminstraci\u00f3n del Blog
+admin.login.title = Iniciar Sesi\u00f3n
+admin.signup.title = Registrarse
+admin.post.all.title = Todos los art\u00edculos
+admin.post.create.title = Crear nuevo art\u00edculo
+admin.post.delete.title = Eliminar Art\u00edculo
+admin.post.edit.title = Editar Art\u00edculo
+admin.user.all.title = Todos los usuarios
+frontend.post.show.title = OhMyBlog! | {0}
+frontend.post.about.title = Acerca de este blog
+frontend.post.home.title = ohMyBlog! | Blog para los amantes de la web
 ###### Navigation #######
 frontend.navigation.home = Inicio
 frontend.navigation.about = Acerca de

src/main/webapp/WEB-INF/templates/admin/fragment/post.html

@@ -26,25 +26,29 @@
                 </div>
             </div>
             <div class="row control-group">
-                <div class="form-group col-xs-12">
+                <div class="form-group">
                     <label class="col-md-2 control-label" th:text="#{form.post.status}">Post status</label>
                     <div class="col-md-10">
                         <div class="radio">
-                            <label for="radio_published" th:text="#{form.post.published}">Published</label>
-                            <input th:field="*{published}" type="radio" id="radio_published" name="post_status" value="true" />
+                            <label>
+                                <input th:field="*{published}" type="radio" id="radio_published" name="post_status" value="true" />
+                                <span th:text="#{form.post.published}">Published</span>
+                            </label>
                         </div>
                         <div class="radio">
-                            <label for="radio_not_published" th:text="#{form.post.notpublished}">Not Published</label>
-                            <input th:field="*{published}" type="radio" id="radio_not_published" name="post_status" value="false" />
+                            <label>
+                                <input th:field="*{published}" type="radio" id="radio_not_published" name="post_status" value="false" />
+                                <span th:text="#{form.post.notpublished}">Not Published</span>
+                            </label>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="row control-group">
                 <div class="form-group">
-                    <label class="col-md-2 control-label" th:text="#{form.post.image.label}">Image</label>
-                    <div class="col-md-10">
-                        <input type="file" accept="image/jpeg,image/png,image/gif" class="btn btn-default" id="image" name="postImage">
+                    <label class="col-md-1 control-label" th:text="#{form.post.image.label}">Image</label>
+                    <div class="col-md-11">
+                        <input type="file" accept="image/jpeg,image/jpg,image/png,image/gif" class="btn btn-default" id="image" name="postImage">
                         <p class="help-block" th:text="#{form.post.image.help}">
                             some help text here.
                         </p>

src/main/webapp/WEB-INF/templates/admin/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html layout:decorator="admin/layout">
     <head>
-        <title>TODO supply a title</title>
+        <title th:text="#{admin.home.title}">Admin</title>
     </head>
     <body>
         <div layout:fragment="content">

src/main/webapp/WEB-INF/templates/admin/login.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html layout:decorator="admin/layout">
     <head>
-        <title>Login</title>
+        <title th:text="#{admin.login.title}">Login</title>
     </head>
     <body>
         <div layout:fragment="page-content">

src/main/webapp/WEB-INF/templates/admin/post/all.html

@@ -4,7 +4,7 @@
     xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
     layout:decorator="admin/layout">
     <head>
-        <title>TODO supply a title</title>
+        <title th:text="#{admin.post.all.title}">All Posts</title>
     </head>
     <body>
         <div layout:fragment="main-content">

src/main/webapp/WEB-INF/templates/admin/post/create.html

@@ -4,8 +4,8 @@
     xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
     layout:decorator="admin/layout">
     <head>
-        <title>TODO supply a title</title>
-        <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap-wysihtml5-0.0.2.css}"></link> 
+        <title th:text="#{admin.post.create.title}">Create Post</title>
+        <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap3-wysihtml5.min.css}"></link> 
     </head>
     <body>
         <div layout:fragment="main-content">
@@ -17,11 +17,14 @@
             </div>
         </div>
         <th:block layout:fragment="scripts">
-            <script th:src="@{/js/wysihtml5-0.3.0.min.js}"></script>
-            <script th:src="@{/js/bootstrap-wysihtml5-0.0.2.min.js}"></script>
+            <script th:src="@{/js/bootstrap3-wysihtml5.all.min.js}"></script>
             <script>
                 $(function() {
-                    $('#bootstrap-editor').wysihtml5();
+                    $('#bootstrap-editor').wysihtml5({
+                        toolbar: {
+                            "fa": true
+                        }
+                    });
                 });
             </script>
         </th:block>