LUT-19213 : Add a draft status to blog post

Author: TimotheeHrl

src/java/fr/paris/lutece/plugins/blog/business/BlogDAO.java

@@ -35,6 +35,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.sql.Timestamp;
 
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -78,7 +79,7 @@ public final class BlogDAO implements IBlogDAO
     private static final String SQL_QUERY_SELECT_BLOG_BY_ID_TAG = " SELECT b.id_blog, b.version, b.content_label, b.creation_date, b.update_date, b.html_content, b.user_editor, b.user_creator, b.attached_portlet_id, b.edit_comment, b.description, b.shareable, b.url, a.id_tag FROM blog_tag_document a Inner join blog_blog b on (b.id_blog = a.id_blog) WHERE a.id_tag = ? ORDER BY priority";
 
     private static final String SQL_QUERY_SELECT_ALL_BLOG = " SELECT DISTINCT a.id_blog, a.version, a.content_label, a.creation_date, a.update_date, a.html_content, a.user_editor, a.user_creator , a.attached_portlet_id, a.edit_comment , a.description, a.shareable, a.url FROM blog_blog a";
-
+    private static final String SQL_QUERY_SELECT_VERSION_NUMBER_BY_BLOG_ID_AND_CREATION_DATE = "SELECT version FROM blog_versions WHERE id_blog = ? ORDER BY ABS(TIMESTAMPDIFF(SECOND, update_date, ?)) LIMIT 1;";
     private static final String SQL_FILTER_WHERE_CLAUSE = " WHERE ";
     private static final String SQL_FILTER_AND = " AND ";
     private static final String SQL_FILTER_TAGS_BEGIN = " (";
@@ -95,9 +96,9 @@ public final class BlogDAO implements IBlogDAO
 
     /**
      * Generates a new primary key
-     * 
+     *
      * @param plugin
-     *            The Plugin
+     *         The Plugin
      * @return The new primary key
      */
     public int newPrimaryKey( Plugin plugin )
@@ -116,7 +117,7 @@ public int newPrimaryKey( Plugin plugin )
 
     /**
      * Generates a new primary key
-     * 
+     *
      * @param plugin
      *            The Plugin
      * @return The new primary key
@@ -596,7 +597,7 @@ public List<Blog> selectByFilter( BlogFilter filter )
 
     /**
      * Return a dao initialized with the specified filter
-     * 
+     *
      * @param strQuerySelect
      *            the query
      * @param filter
@@ -848,4 +849,31 @@ public List<Blog> selectLastBlogVersionsList( int nId, int nLimit, Plugin plugin
         }
         return blogList;
     }
+
+    /**
+     * Returns the actual version number of a blog It get the version number witch has is the closest to the update date
+     *
+     * @param strUpdateDate
+     *         the update date
+     * @param nId
+     *         the blog id
+     * @return the version number
+     */
+    @Override
+    public int getActualVersionNumber( Timestamp strUpdateDate, int nId, Plugin plugin )
+    {
+        int nVersion = 0;
+        try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_VERSION_NUMBER_BY_BLOG_ID_AND_CREATION_DATE, plugin ) )
+        {
+            daoUtil.setInt( 1, nId );
+            daoUtil.setTimestamp( 2, strUpdateDate );
+            daoUtil.executeQuery( );
+
+            if ( daoUtil.next( ) )
+            {
+                nVersion = daoUtil.getInt( 1 );
+            }
+            return nVersion;
+        }
+    }
 }

src/java/fr/paris/lutece/plugins/blog/business/BlogHome.java

@@ -34,7 +34,7 @@
 package fr.paris.lutece.plugins.blog.business;
 
 import java.util.List;
-
+import java.sql.Timestamp;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.portal.service.plugin.PluginService;
 import fr.paris.lutece.portal.service.spring.SpringContextService;
@@ -263,7 +263,6 @@ public static Blog addInitialVersion( Blog blog )
 
         return blog;
     }
-
     /**
      * Adds a new version of an Blog
      *
@@ -273,7 +272,6 @@ public static Blog addInitialVersion( Blog blog )
      */
     public static Blog addNewVersion( Blog blog )
     {
-        BlogHome.update( blog );
         BlogHome.createVersion( blog );
 
         return blog;
@@ -313,4 +311,16 @@ public static List<Blog> selectWithoutBinaries( )
         return _dao.selectWithoutBinaries( _plugin );
     }
 
+    /**
+     * Returns the actual version number of a blog
+     * It get the version number witch has is the closest to the update date
+     * @param strUpdateDate the update date
+     * @param nId the blog id
+     * @return the version number
+     */
+    public static int getActualVersionNumber( Timestamp strUpdateDate, int nId )
+    {
+        return _dao.getActualVersionNumber( strUpdateDate, nId, _plugin );
+    }
+
 }

src/java/fr/paris/lutece/plugins/blog/business/IBlogDAO.java

@@ -231,4 +231,5 @@ public interface IBlogDAO
 
     List<Blog> selectWithoutBinaries( Plugin plugin );
 
+    int getActualVersionNumber( java.sql.Timestamp strUpdateDate, int nId, fr.paris.lutece.portal.service.plugin.Plugin plugin );
 }

src/java/fr/paris/lutece/plugins/blog/resources/blog_messages.properties

@@ -149,6 +149,9 @@ modify_blog.labelCreator.help=Author
 modify_blog.labelProperties=Properties
 modify_blog.labelAddToContent=Add to content
 modify_blog.labelToolbarLabel=Post management toolbar
+modify_blog.labelUpdate=Update
+modify_blog.labelSave=Save
+modify_blog.returnToActualVersion=Return to the current version
 
 history_blog.pageTitle=History
 history_blog.title=History of this post

src/java/fr/paris/lutece/plugins/blog/resources/blog_messages_fr.properties

@@ -150,6 +150,9 @@ modify_blog.labelLoading=Chargement...
 modify_blog.labelProperties=Propri\u00e9t\u00e9s
 modify_blog.labelAddToContent=Ajouter au contenu
 modify_blog.labelToolbarLabel=Boutons de gestion du billet
+modify_blog.labelUpdate=Actualiser
+modify_blog.labelSave=Enregistrer
+modify_blog.returnToActualVersion=Revenir \u00e0 la version actuelle
 
 history_blog.pageTitle=Historique du billet
 history_blog.title=Liste des modification du billet

src/java/fr/paris/lutece/plugins/blog/web/BlogJspBean.java

@@ -155,7 +155,7 @@ public class BlogJspBean extends ManageBlogJspBean
     protected static final String PARAMETER_PRIORITY = "tag_priority";
     protected static final String PARAMETER_TAG_ACTION = "tagAction";
     protected static final String PARAMETER_ACTION_BUTTON = "button";
-    protected static final String PARAMETER_APPLY = "apply";
+    protected static final String PARAMETER_UPDATE = "update";
     protected static final String PARAMETER_TYPE_ID = "idType";
     protected static final String PARAMETER_CONTENT_ID = "idContent";
     protected static final String PARAMETER_CONTENT_ACTION = "contentAction";
@@ -250,6 +250,7 @@ public class BlogJspBean extends ManageBlogJspBean
     protected static final String MARK_DATE_UPDATE_BLOG_BEFOR = "dateUpdateBlogBefor";
     protected static final String MARK_UNPUBLISHED = "unpublished";
     protected static final String MARK_LIST_BLOG_CONTRIBUTORS = "list_blog_contributors";
+    protected static final String MARK_ACTUAL_BLOG_VERSION = "actual_blog_version";
 
     public static final String CONSTANT_DUPLICATE_BLOG_NAME = "Copie de ";
 
@@ -656,7 +657,7 @@ public String doCreateBlog( HttpServletRequest request )
             BlogService.getInstance( ).createBlog( _blog, _blog.getDocContent( ) );
             _blogServiceSession.removeDocContentFromSession( request.getSession( ), user );
 
-            if ( strAction != null && strAction.equals( PARAMETER_APPLY ) )
+            if ( strAction != null && strAction.equals( PARAMETER_UPDATE ) )
             {
 
                 return redirect( request, VIEW_MODIFY_BLOG, PARAMETER_ID_BLOG, _blog.getId( ) );
@@ -952,22 +953,29 @@ public String getModifyBlog( HttpServletRequest request ) throws AccessDeniedExc
         String strResetVersion = request.getParameter( PARAMETER_VERSION_BLOG );
         String useCropImage = DatastoreService.getDataValue( PROPERTY_USE_UPLOAD_IMAGE_PLUGIN, "false" );
         String sessionId = request.getSession( ).getId( );
+        Map<String, Object> model = getModel( );
 
         int nVersion = -1;
         if ( strResetVersion != null )
         {
             nVersion = Integer.parseInt( strResetVersion );
-        }
-
-        if ( strResetVersion != null )
-        {
-
             _blog = BlogHome.findVersion( nId, nVersion );
             _blogServiceSession.saveBlogInSession( request.getSession( ), _blog );
         }
         else
         {
-            _blog = BlogService.getInstance( ).loadBlog( nId );
+            Blog actualBlog = BlogService.getInstance( ).loadBlog( nId );
+            Blog lastVersion = BlogHome.getLastBlogVersionsList( nId, 1 ).get( 0 );
+
+            // compare if content title, description or content are differents from the last version and actual version (the version that visitors could see if the blog is published)
+            if ( !actualBlog.getContentLabel( ).equals( lastVersion.getContentLabel( ) ) || !actualBlog.getDescription( ).equals( lastVersion.getDescription( ) ) )
+            {
+                // get the actual version number that visitors could see so that the user can choose to reset to this version
+               Timestamp actualVersionUpdateDate = actualBlog.getUpdateDate();
+               int actualVersion = BlogHome.getActualVersionNumber( actualVersionUpdateDate,nId );
+               model.put( MARK_ACTUAL_BLOG_VERSION, actualVersion );
+            }
+          _blog = lastVersion;
             _blogServiceSession.saveBlogInSession( request.getSession( ), _blog );
 
         }
@@ -993,13 +1001,15 @@ public String getModifyBlog( HttpServletRequest request ) throws AccessDeniedExc
 
         _blog.getTag( ).sort( ( tg1, tg2 ) -> tg1.getPriority( ) - tg2.getPriority( ) );
         _blog.getDocContent( ).sort( ( dc1, dc2 ) -> dc1.getPriority( ) - dc2.getPriority( ) );
-        Map<String, Object> model = getModel( );
 
         boolean bPermissionCreate = RBACService.isAuthorized( Tag.PROPERTY_RESOURCE_TYPE, RBAC.WILDCARD_RESOURCES_ID, Tag.PERMISSION_CREATE,
                 (User) getUser( ) );
+        boolean bPermissionToPublish = RBACService.isAuthorized( Blog.PROPERTY_RESOURCE_TYPE, RBAC.WILDCARD_RESOURCES_ID, Blog.PERMISSION_PUBLISH,
+                (User) getUser( ) );
 
         model.put( MARK_LIST_IMAGE_TYPE, DocContentHome.getListContentType( ) );
         model.put( MARK_PERMISSION_CREATE_TAG, bPermissionCreate );
+        model.put( MARK_PERMISSION_PUBLISH_BLOG, bPermissionToPublish );
         model.put( MARK_BLOG, _blog );
         model.put( MARK_LIST_TAG, getTageList( ) );
         model.put( MARK_USE_UPLOAD_IMAGE_PLUGIN, Boolean.parseBoolean( useCropImage ) );
@@ -1057,23 +1067,25 @@ public String doModifyBlog( HttpServletRequest request )
             {
                 return redirect( request, VIEW_MODIFY_BLOG, PARAMETER_ID_BLOG, _blog.getId( ) );
             }
-
-            if ( strAction != null && strAction.equals( PARAMETER_APPLY ) )
+            if ( strAction != null && strAction.equals( PARAMETER_UPDATE ) && RBACService.isAuthorized( Blog.PROPERTY_RESOURCE_TYPE, strId, Blog.PERMISSION_PUBLISH, (User) getUser( ) ) )
             {
-                BlogService.getInstance( ).updateBlogWithoutVersion( _blog, _blog.getDocContent( ) );
+                _blog.setVersion( latestVersionBlog.getVersion( ) + 1 );
+                BlogHome.update( _blog );
+                BlogService.getInstance( ).updateBlog( _blog, _blog.getDocContent( ) );
                 _blogServiceSession.removeBlogFromSession( request.getSession( ), nId );
                 unLockBlog( nId );
-
-                return redirect( request, VIEW_MODIFY_BLOG, PARAMETER_ID_BLOG, _blog.getId( ) );
-
+                addInfo( INFO_BLOG_UPDATED, getLocale( ) );
             }
             else
             {
                 _blog.setVersion( latestVersionBlog.getVersion( ) + 1 );
                 BlogService.getInstance( ).updateBlog( _blog, _blog.getDocContent( ) );
+                _blog = latestVersionBlog;
+                _blog.setVersion( latestVersionBlog.getVersion( ) + 1 );
+                BlogHome.update( _blog );
                 _blogServiceSession.removeBlogFromSession( request.getSession( ), nId );
                 unLockBlog( nId );
-                addInfo( INFO_BLOG_UPDATED, getLocale( ) );
+                return redirect( request, VIEW_MODIFY_BLOG, PARAMETER_ID_BLOG, _blog.getId( ) );
             }
         }
         return redirectView( request, VIEW_MANAGE_BLOGS );

webapp/WEB-INF/templates/admin/plugins/blog/modify_blog.html

@@ -6,11 +6,16 @@
   <@row id='blog-toolbar-wrapper'>
     <@columns>
       <@btnToolbar id='blog-toolbar' params='aria-label="#i18n{blog.modify_blog.labelToolbarLabel}"'>
-        <@button class='me-1' type='submit' size='' buttonIcon='check me-2' title='#i18n{portal.util.labelModify}' value='modify' id='action_modifyblog' name='action_modifyblog' hideTitle=['xs','sm'] />
-        <@button class='me-1' type='submit' size='' buttonIcon='device-floppy me-2' title='#i18n{blog.create_blog.labelApply}' value='apply' name='button' hideTitle=['xs','sm'] />
+        <#if permission_manage_publish_blog?? && permission_manage_publish_blog>
+          <@button class='me-1' type='submit' size='' buttonIcon='check me-2' title='#i18n{blog.modify_blog.labelUpdate}' value='update' name='button' hideTitle=['xs','sm'] />
+        </#if>
+        <@button class='me-1' type='submit' size='' buttonIcon='device-floppy me-2' title='#i18n{blog.modify_blog.labelSave}' value='modify' id='action_modifyblog' name='action_modifyblog' hideTitle=['xs','sm'] />
         <@aButton class='me-1' href='jsp/admin/plugins/blog/ManageBlogs.jsp?action=confirmRemoveBlog&amp;id=${blog.id}' color='danger' title='#i18n{portal.util.labelDelete}' buttonIcon='trash' hideTitle=['xs','sm'] size='' />
         <@aButton class='me-1' href='jsp/admin/plugins/blog/ManagePublicationBlogs.jsp?view=manageBlogsPublication&id=${blog.id}' title='#i18n{blog.publication_blog.pageTitle}' buttonIcon='globe' hideTitle=['xs','sm'] size='' />
         <@aButton href='jsp/admin/plugins/blog/ManageBlogs.jsp?view=historyBlog&amp;id=${blog.id}' class='btn-notif me-1' title='#i18n{blog.manage_blogs.labelHistory}  [ ${blog.version} versions]' hideTitle=['xs','sm', 'md'] buttonIcon='history' size='' />
+        <#if actual_blog_version?? >
+          <@aButton class='btn-notif me-1' color='danger' href='jsp/admin/plugins/blog/ManageBlogs.jsp?view=modifyBlog&id=${blog.id}&blog_version=${actual_blog_version}' title='#i18n{blog.modify_blog.returnToActualVersion}' hideTitle=['xs','sm', 'md'] buttonIcon='history' size='' />
+        </#if>
         <@offcanvas id='blog-properties' title='#i18n{blog.modify_blog.labelProperties}' btnTitle='#i18n{blog.modify_blog.labelProperties}' position='end' btnIcon='cog me-2'>
           <@box class='mt-3'>
             <@boxHeader title='#i18n{blog.modify_blog.TagsTitle}'>
@@ -140,4 +145,4 @@
 <@blogScriptInit />
 <script>
 <@charcounter />
-</script>
+</script>