Skip to content

Commit 87434fc

Browse files
author
Jeremy Deloche
committed
LUT-29318: Freemarker error on blog creation
1 parent d750437 commit 87434fc

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

‎webapp/WEB-INF/templates/admin/plugins/blog/blog_commons.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
var numberOfTagsAssigned = '${blogTagSize}';
1717
var numberMandatoryTags = '${number_mandatory_tags}';
1818

19-
var all_tag = [<#list list_alltag as tag>['${tag.code}','${tag.name?js_string}' ],</#list>];
20-
var blog_tag = [<#list blog.tag as tag>'${tag.idTag}',</#list>];
21-
22-
var msgErrorTagExist = '#i18n{blog.message.errorTagExist}'
19+
var msgErrorTagExist = '#i18n{blog.message.errorTagExist}'
2320
var msgErrorTagUpdatePosition = '#i18n{blog.message.errorTagUpdatePosition}'
2421
var msgErrorTagDeletion = '#i18n{blog.message.errorTagDeletion}'
2522
var msgErrorTagTitleNotEmpty = '#i18n{blog.message.errorTagTitleNotEmpty}'
@@ -48,6 +45,8 @@
4845
dDesc=document.querySelector('#div_description') , iDesc=document.querySelector('#description'),
4946
dHtml=document.querySelector('#div_html_content') , iHtml=document.querySelector('#html_content');
5047

48+
refreshMandatoryTagInfo( );
49+
5150
formEditor.addEventListener( "submit", event => {
5251
const t = dLabel.textContent.replace('\n','').replace('#i18n{blog.message.default.blogTitle}','').trim();
5352
if( t == '' ){

‎webapp/WEB-INF/templates/admin/plugins/blog/create_blog.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,17 @@
99
<@row id='blog-toolbar-wrapper'>
1010
<@columns>
1111
<@btnToolbar id='blog-toolbar' params='aria-label="#i18n{blog.modify_blog.labelToolbarLabel}"'>
12-
<#if number_mandatory_tags gte blogTagSize>
13-
<@alert id='required-tag' color='warning' class='mb-0 me-2'>${i18n("blog.mandatoryTags.assign.mandatory.tags",number_mandatory_tags)} </@alert>
14-
</#if>
15-
<#-- <@button class='me-1' color='default' size='sm' buttonIcon='arrow-right' title='#i18n{portal.util.labelModify}' value='' id='toolbar-collapse' hideTitle=['all'] disabled=(number_mandatory_tags gt blogTagSize) /> -->
16-
<@button class='me-1 action' type='submit' size='' buttonIcon='check me-2' title='#i18n{blog.create_blog.labelCreate}' id='action_createBlog' name='action_createBlog' hideTitle=['xs','sm'] disabled=(number_mandatory_tags gt blogTagSize) />
12+
<@alert id='required-tag' color='warning' class='mb-0 me-2'>${i18n("blog.mandatoryTags.assign.mandatory.tags",number_mandatory_tags)} </@alert>
13+
<#-- <@button class='me-1' color='default' size='sm' buttonIcon='arrow-right' title='#i18n{portal.util.labelModify}' value='' id='toolbar-collapse' hideTitle=['all'] /> -->
14+
<@button class='me-1 action' type='submit' size='' buttonIcon='check me-2' title='#i18n{blog.create_blog.labelCreate}' id='action_createBlog' name='action_createBlog' hideTitle=['xs','sm'] />
1715
<@offcanvas id='blog-properties' title='#i18n{blog.create_blog.labelProperties}' btnTitle='#i18n{blog.create_blog.labelProperties}' position='end' btnIcon='cog me-2' btnClass='me-1' >
1816
<@box>
1917
<@boxHeader title='#i18n{blog.modify_blog.TagsTitle}'>
2018
<@icon style='tags' />
2119
</@boxHeader>
2220
<@boxBody>
23-
<#if number_mandatory_tags &gt; 0 && blogTagSize &gt; number_mandatory_tags-1>
21+
<#if number_mandatory_tags &gt; 0 >
2422
<@alert id='enoughTagsInfo' color='info'>#i18n{blog.mandatoryTags.minimum.number}: ${number_mandatory_tags}</@alert>
25-
<#elseif number_mandatory_tags &gt; 0 && number_mandatory_tags &gt; blogTagSize>
26-
<@alert id='enoughTagsInfo' color='warning'>#i18n{blog.mandatoryTags.minimum.number}: ${number_mandatory_tags}</@alert>
2723
</#if>
2824
<@formGroup labelFor='addTag' labelKey='#i18n{blog.manage_tags.buttonAdd}' rows=2>
2925
<@inputGroup>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<#assign alertClass>mb-0 me-2<#if number_mandatory_tags gte blogTagSize> visually-hidden</#if></#assign>
1212
<@alert id='required-tag' color='warning' class=alertClass>${i18n("blog.mandatoryTags.assign.mandatory.tags",number_mandatory_tags)} </@alert>
1313
<#if permission_manage_publish_blog?? && permission_manage_publish_blog>
14-
<@button class='me-1 action' type='submit' size='' buttonIcon='check me-2' title='#i18n{blog.modify_blog.labelUpdate}' value='update' id='action_modifyblog' name='button' hideTitle=['xs','sm'] disabled=(number_mandatory_tags gt blogTagSize) />
14+
<@button class='me-1 action' type='submit' size='' buttonIcon='check me-2' title='#i18n{blog.modify_blog.labelUpdate}' value='update' id='action_modifyblog' name='button' hideTitle=['xs','sm'] />
1515
</#if>
16-
<@button class='me-1 action' type='submit' size='' buttonIcon='device-floppy me-2' title='#i18n{blog.modify_blog.labelSave}' value='modify' id='action_modifyblog' id='apply_modifyblog' name='action_modifyblog' hideTitle=['xs','sm'] disabled=(number_mandatory_tags gt blogTagSize) />
16+
<@button class='me-1 action' type='submit' size='' buttonIcon='device-floppy me-2' title='#i18n{blog.modify_blog.labelSave}' value='modify' id='action_modifyblog' id='apply_modifyblog' name='action_modifyblog' hideTitle=['xs','sm'] />
1717
<@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='' />
1818
<@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='' />
1919
<@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='' />
@@ -26,10 +26,8 @@
2626
<@link href='jsp/admin/plugins/blog/ManageTags.jsp?plugin_name=blog' title='#i18n{blog.manage_tags.columnTagLabel}' target='_blank'><@icon style='tags' /></@link>
2727
</@boxHeader>
2828
<@boxBody>
29-
<#if number_mandatory_tags &gt; 0 && blogTagSize &gt; number_mandatory_tags-1>
30-
<@alert id='enoughTagsInfo' color='info'>#i18n{blog.mandatoryTags.minimum.number}: ${number_mandatory_tags}</@alert>
31-
<#elseif number_mandatory_tags &gt; 0 && number_mandatory_tags &gt; blogTagSize>
32-
<@alert id='enoughTagsInfo' color='warning'>#i18n{blog.mandatoryTags.minimum.number}: ${number_mandatory_tags}</@alert>
29+
<#if number_mandatory_tags &gt; 0 >
30+
<@alert id='enoughTagsInfo' color='info'>#i18n{blog.mandatoryTags.minimum.number}: ${number_mandatory_tags}</@alert>
3331
</#if>
3432
<@formGroup labelFor='addTag' labelKey='#i18n{blog.manage_tags.buttonAdd}' rows=2>
3533
<@inputGroup>

‎webapp/themes/admin/shared/plugins/blog/js/blog.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,34 @@ async function doUpdatePriorityTag( idTag, action, blogId ){
9292
function refreshMandatoryTagInfo( ){
9393
const alertRequiredTags = document.getElementById('required-tag');
9494
const actionBtn = document.querySelectorAll('#blog-toolbar .btn.action');
95+
const elemEnoughTagsInfo = document.getElementById('enoughTagsInfo');
96+
9597
if( actionBtn.length > 0 ){
9698
actionBtn.forEach( ( btn ) => {
9799
if( numberOfTagsAssigned <= ( parseInt( numberMandatoryTags ) - 1 ) ) {
98100
btn.disabled = true;
99-
alertRequiredTags.classList.remove('visually-hidden');
100101
} else {
101-
alertRequiredTags.classList.add('visually-hidden');
102102
btn.disabled = false;
103103
}
104104
});
105105
}
106+
107+
if( numberOfTagsAssigned <= ( parseInt( numberMandatoryTags ) - 1 ) ) {
108+
alertRequiredTags.classList.remove('visually-hidden');
109+
if(elemEnoughTagsInfo!=null)
110+
{
111+
elemEnoughTagsInfo.classList.add('alert-warning');
112+
elemEnoughTagsInfo.classList.remove('alert-info');
113+
}
114+
} else {
115+
alertRequiredTags.classList.add('visually-hidden');
116+
if(elemEnoughTagsInfo!=null)
117+
{
118+
elemEnoughTagsInfo.classList.remove('alert-warning');
119+
elemEnoughTagsInfo.classList.add('alert-info');
120+
}
121+
}
122+
106123
}
107124

108125
function setListTag( idTag, tgName, blogId ){

0 commit comments

Comments
 (0)