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

Bugfixes for SideNote assets

pull/10/head
Jens Pelzetter 2021-05-24 18:40:48 +02:00
parent b083446c71
commit c5d3125dcd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java
View File

@ -25,6 +25,7 @@ import org.librecms.contentsection.AssetRepository;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
@ -86,6 +87,11 @@ public class SideNoteCreateStep extends AbstractMvcAssetCreateStep<SideNote> {
public String setAssetProperties( public String setAssetProperties(
final SideNote sideNote, final Map<String, String[]> formParams final SideNote sideNote, final Map<String, String[]> formParams
) { ) {
text = Optional
.ofNullable(formParams.get("text"))
.filter(value -> value.length > 0)
.map(value -> value[0])
.orElse("");
sideNote.getText().addValue(new Locale(getInitialLocale()), text); sideNote.getText().addValue(new Locale(getInitialLocale()), text);
assetRepo.save(sideNote); assetRepo.save(sideNote);

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

@ -28,8 +28,6 @@ import org.librecms.ui.contentsections.AssetPermissionsChecker;
import org.librecms.ui.contentsections.ContentSectionNotFoundException; import org.librecms.ui.contentsections.ContentSectionNotFoundException;
import org.librecms.ui.contentsections.documents.CmsEditorLocaleVariantRow; import org.librecms.ui.contentsections.documents.CmsEditorLocaleVariantRow;
import java.util.Collections;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -151,7 +149,6 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
} }
if (assetPermissionsChecker.canEditAsset(getAsset())) { if (assetPermissionsChecker.canEditAsset(getAsset())) {
return "org/librecms/ui/contentsection/assets/sidenote/edit-sidenote.xhtml"; return "org/librecms/ui/contentsection/assets/sidenote/edit-sidenote.xhtml";
} else { } else {
return assetUi.showAccessDenied( return assetUi.showAccessDenied(