Skip to content

LUT-31992 V8 : Add a new freemarker processor to determine if a plugi… #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnasBenjelloun wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

LUT-31992 V8 : Add a new freemarker processor to determine if a plugi… #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/java/fr/paris/lutece/portal/service/plugin/PluginActiveTemplateMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package fr.paris.lutece.portal.service.plugin;

import freemarker.template.TemplateBooleanModel;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateScalarModel;

import java.util.List;

public class PluginActiveTemplateMethod implements TemplateMethodModelEx
{
@Override
public Object exec( @SuppressWarnings( "rawtypes" ) List arguments ) throws TemplateModelException
{
int argsSize = arguments.size( );

if ( argsSize != 1 )
{
throw new TemplateModelException( "Must be called with exactly one argument (the plugin name)" );
}

String pluginName = ( (TemplateScalarModel) arguments.get( 0 ) ).getAsString( );

boolean isPluginActive = PluginService.isPluginEnable( pluginName );

if ( isPluginActive )
{
return TemplateBooleanModel.TRUE;
}
else
{
return TemplateBooleanModel.FALSE;
}
}
}
2 changes: 2 additions & 0 deletions src/java/fr/paris/lutece/portal/service/template/AppTemplateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import fr.paris.lutece.portal.service.i18n.I18nService;
import fr.paris.lutece.portal.service.i18n.I18nTemplateMethod;
import fr.paris.lutece.portal.service.plugin.Plugin;
import fr.paris.lutece.portal.service.plugin.PluginActiveTemplateMethod;
import fr.paris.lutece.portal.service.plugin.PluginService;
import fr.paris.lutece.portal.service.security.SecurityTokenHandler;
import fr.paris.lutece.portal.service.util.AppLogService;
Expand Down Expand Up @@ -75,6 +76,7 @@ public static void init( String strTemplatePath, final ServletContext context )
_context= context;
_strTemplateDefaultPath = strTemplatePath;
getFreeMarkerTemplateService( ).setSharedVariable( "i18n", new I18nTemplateMethod( ) );
getFreeMarkerTemplateService( ).setSharedVariable( "isLutecepluginEnable", new PluginActiveTemplateMethod( ) );
}

/**
Expand Down
24 changes: 13 additions & 11 deletions webapp/WEB-INF/templates/admin/util/editor/editor_tinymce5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,18 @@

// Set buttons
if( luteceInsertServices.length > 0 ){
if( luteceInsertServices.includes('library') && autorizedInsertService.includes('library') ){
if( luteceInsertServices.includes('image') ){
luteceToolbar = ' luteceImage';
insertServiceConfigImage = {lutece_insert_service_media_type_image : '#dskey{library.insert_service_media_type_image}', lutece_insert_service_media_type_image_space : '#dskey{library.insert_service_media_type_image_space}'};
}
if( luteceInsertServices.includes('pdf') ){
luteceToolbar += ' lutecePdf';
insertServiceConfigPdf = { lutece_insert_service_media_type_pdf : '#dskey{library.insert_service_media_type_pdf}', lutece_insert_service_media_type_pdf_space : '#dskey{library.insert_service_media_type_pdf_space}' };
}
}
<#if isLutecepluginEnable( "library" )>
if( luteceInsertServices.includes('library') && autorizedInsertService.includes('library') ){
if( luteceInsertServices.includes('image') ){
luteceToolbar = ' luteceImage';
insertServiceConfigImage = {lutece_insert_service_media_type_image : '#dskey{library.insert_service_media_type_image}', lutece_insert_service_media_type_image_space : '#dskey{library.insert_service_media_type_image_space}'};
}
if( luteceInsertServices.includes('pdf') ){
luteceToolbar += ' lutecePdf';
insertServiceConfigPdf = { lutece_insert_service_media_type_pdf : '#dskey{library.insert_service_media_type_pdf}', lutece_insert_service_media_type_pdf_space : '#dskey{library.insert_service_media_type_pdf_space}' };
}
}
</#if>

if( luteceInsertServices.includes('pagelinkservice') && autorizedInsertService.includes('pagelinkservice') ){
luteceToolbar += ' lutecePageLink';
Expand Down Expand Up @@ -136,4 +138,4 @@
});
})
</script>
</#macro>
</#macro>
24 changes: 13 additions & 11 deletions webapp/WEB-INF/templates/admin/util/editor/editor_tinymce6.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,18 @@

// Set buttons
if( luteceInsertServices.length > 0 ){
if( luteceInsertServices.includes('library') && autorizedInsertService.includes('library') ){
if( luteceInsertServices.includes('image') ){
luteceToolbar = ' luteceImage';
insertServiceConfigImage = {lutece_insert_service_media_type_image : '#dskey{library.insert_service_media_type_image}', lutece_insert_service_media_type_image_space : '#dskey{library.insert_service_media_type_image_space}'};
}
if( luteceInsertServices.includes('pdf') ){
luteceToolbar += ' lutecePdf';
insertServiceConfigPdf = { lutece_insert_service_media_type_pdf : '#dskey{library.insert_service_media_type_pdf}', lutece_insert_service_media_type_pdf_space : '#dskey{library.insert_service_media_type_pdf_space}' };
}
}
<#if isLutecepluginEnable( "library" )>
if( luteceInsertServices.includes('library') && autorizedInsertService.includes('library') ){
if( luteceInsertServices.includes('image') ){
luteceToolbar = ' luteceImage';
insertServiceConfigImage = {lutece_insert_service_media_type_image : '#dskey{library.insert_service_media_type_image}', lutece_insert_service_media_type_image_space : '#dskey{library.insert_service_media_type_image_space}'};
}
if( luteceInsertServices.includes('pdf') ){
luteceToolbar += ' lutecePdf';
insertServiceConfigPdf = { lutece_insert_service_media_type_pdf : '#dskey{library.insert_service_media_type_pdf}', lutece_insert_service_media_type_pdf_space : '#dskey{library.insert_service_media_type_pdf_space}' };
}
}
</#if>

if( luteceInsertServices.includes('pagelinkservice') && autorizedInsertService.includes('pagelinkservice') ){
luteceToolbar += ' lutecePageLink';
Expand Down Expand Up @@ -133,4 +135,4 @@
});
})
</script>
</#macro>
</#macro>