@@ -249,6 +249,7 @@ public class BlogJspBean extends ManageBlogJspBean
249
249
protected static final String MARK_DATE_UPDATE_BLOG_AFTER = "dateUpdateBlogAfter" ;
250
250
protected static final String MARK_DATE_UPDATE_BLOG_BEFOR = "dateUpdateBlogBefor" ;
251
251
protected static final String MARK_UNPUBLISHED = "unpublished" ;
252
+ protected static final String MARK_LIST_BLOG_CONTRIBUTORS = "list_blog_contributors" ;
252
253
253
254
public static final String CONSTANT_DUPLICATE_BLOG_NAME = "Copie de " ;
254
255
@@ -371,20 +372,22 @@ public String getManageBlogs( HttpServletRequest request )
371
372
AbstractPaginator .PARAMETER_PAGE_INDEX , _strCurrentPageIndex , getLocale ( ) );
372
373
373
374
List <Blog > listDocuments = new ArrayList <>( );
374
-
375
+ HashMap < Integer , List < String >> mapContributors = new HashMap <>( );
375
376
for ( Integer documentId : paginator .getPageItems ( ) )
376
377
{
377
378
Blog document = BlogService .getInstance ( ).findByPrimaryKeyWithoutBinaries ( documentId );
378
379
379
380
if ( document != null )
380
381
{
381
- if ( _mapLockBlog .containsKey ( document .getId ( ) )
382
- && ! _mapLockBlog . get ( document . getId ( ) ). getSessionId ( ) .equals ( request .getSession ( ).getId ( ) ) )
382
+ if ( _mapLockBlog .containsKey ( document .getId ( ) ) && ! _mapLockBlog . get ( document . getId ( ) ). getSessionId ( )
383
+ .equals ( request .getSession ( ).getId ( ) ) )
383
384
{
384
385
385
386
document .setLocked ( true );
386
387
}
387
388
listDocuments .add ( document );
389
+ List <String > listContributors = BlogHome .getUsersEditedBlogVersions ( document .getId ( ) );
390
+ mapContributors .put ( document .getId ( ), listContributors );
388
391
}
389
392
}
390
393
@@ -431,7 +434,7 @@ public String getManageBlogs( HttpServletRequest request )
431
434
model .put ( MARK_DATE_UPDATE_BLOG_AFTER , _dateUpdateBlogAfter );
432
435
model .put ( MARK_DATE_UPDATE_BLOG_BEFOR , _dateUpdateBlogBefor );
433
436
model .put ( MARK_UNPUBLISHED , _bIsUnpulished );
434
-
437
+ model . put ( MARK_LIST_BLOG_CONTRIBUTORS , mapContributors );
435
438
model .put ( MARK_PERMISSION_CREATE_BLOG , bPermissionCreate );
436
439
model .put ( MARK_PERMISSION_MODIFY_BLOG , bPermissionModify );
437
440
model .put ( MARK_PERMISSION_DELETE_BLOG , bPermissionDelete );
@@ -1225,7 +1228,7 @@ public String addContent( HttpServletRequest request )
1225
1228
String partAfterFirstDelimiter = firstParts [0 ];
1226
1229
String [ ] secondParts = partAfterFirstDelimiter .split ( secondDelimiter );
1227
1230
// Le mimeType
1228
- String mimeType = secondParts [1 ];
1231
+ String mimeType = secondParts [1 ];
1229
1232
// Le fichier en base64
1230
1233
String base64FileString = StringUtils .EMPTY ;
1231
1234
// Gestion des fichiers vides
0 commit comments