LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some bugfixes for the side notes edit step.

pull/10/head
Jens Pelzetter 2021-05-19 19:17:20 +02:00
parent 5711a086ea
commit bf26825663
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
View File

@ -207,7 +207,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
@PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME) @PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME)
final String assetPath, final String assetPath,
@PathParam("locale") final String localeParam, @PathParam("locale") final String localeParam,
@PathParam("value") final String value @FormParam("value") final String value
) { ) {
try { try {
init(); init();

4
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java
View File

@ -59,7 +59,7 @@ public class SideNoteEditStepResources {
private AssetPermissionsChecker assetPermissionsChecker; private AssetPermissionsChecker assetPermissionsChecker;
@GET @GET
@Path("/variants/wordcount/{locale}") @Path("/text/variants/wordcount/{locale}")
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String getWordCount( public String getWordCount(
@ -99,7 +99,7 @@ public class SideNoteEditStepResources {
} }
@GET @GET
@Path("/variants/{locale}") @Path("/text/variants/{locale}")
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String viewTextValue( public String viewTextValue(

10
ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditor.xhtml
View File

@ -375,7 +375,7 @@
</span> </span>
</button> </button>
<button class="btn btn-danger" <button class="btn btn-danger"
data-target="##{cc.attrs.editorId}-#{entry.key}-remove-dialog" data-target="##{cc.attrs.editorId}-#{variant.locale}-remove-dialog"
data-toggle="modal" data-toggle="modal"
type="button"> type="button">
<bootstrap:svgIcon icon="x-circle" /> <bootstrap:svgIcon icon="x-circle" />
@ -383,14 +383,14 @@
#{cc.attrs.removeButtonLabel} #{cc.attrs.removeButtonLabel}
</span> </span>
</button> </button>
<div aria-describedby="#{cc.attrs.editorId}-#{entry.key}-remove-dialog-title" <div aria-describedby="#{cc.attrs.editorId}-#{variant.locale}-remove-dialog-title"
aria-hidden="true" aria-hidden="true"
class="modal fade" class="modal fade"
data-backdrop="static" data-backdrop="static"
id="#{cc.attrs.editorId}-#{entry.key}-remove-dialog" id="#{cc.attrs.editorId}-#{variant.locale}-remove-dialog"
tabindex="-1"> tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<form action="#{cc.attrs.removeMethod}/#{entry.key}" <form action="#{cc.attrs.removeMethod}/#{variant.locale}"
class="modal-content" class="modal-content"
method="post"> method="post">
<div class="modal-header"> <div class="modal-header">
@ -425,7 +425,7 @@
<p> <p>
#{cc.attrs.removeDialogText} #{cc.attrs.removeDialogText}
</p> </p>
<pre>#{entry.key}: #{entry.value}</pre> <pre>#{variant.locale}</pre>
<input name="confirmed" <input name="confirmed"
type="hidden" type="hidden"
value="true" /> value="true" />