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

Some bugfixes and typos

pull/10/head
Jens Pelzetter 2021-04-26 20:27:09 +02:00
parent 6c9b3748d0
commit 68f973cf15
12 changed files with 107 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
View File

@ -376,8 +376,9 @@ public class ContentItemRepository
final ContentItemVersion version) {
final TypedQuery<ContentItem> query = getEntityManager()
.createNamedQuery("ContentItem.findByNameAndContentSectionAndVersion",
ContentItem.class);
.createNamedQuery(
"ContentItem.findByNameAndContentSectionAndVersion",
ContentItem.class);
query.setParameter("section", section);
query.setParameter("name", name);
query.setParameter("type", type);
@ -627,8 +628,16 @@ public class ContentItemRepository
//the folder containing the item using the FolderRepository.
final String normalizedPath = PathUtil.normalizePath(path);
final int lastTokenStart = normalizedPath.lastIndexOf('/');
final String folderPath = normalizedPath.substring(0, lastTokenStart);
final String itemName = normalizedPath.substring(lastTokenStart + 1);
final String folderPath;
final String itemName;
if (lastTokenStart == -1) {
folderPath = "/";
itemName = normalizedPath;
} else {
folderPath = normalizedPath.substring(0, lastTokenStart);
itemName = normalizedPath.substring(lastTokenStart + 1);
}
final Optional<Folder> folder = folderRepo.findByPath(
section, folderPath, FolderType.DOCUMENTS_FOLDER);

2
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CategorizationStep.java
View File

@ -93,7 +93,7 @@ public class CategorizationStep {
public String showStep(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {

11
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CmsMvcAuthoringSteps.java
View File

@ -18,6 +18,9 @@
*/
package org.librecms.ui.contentsections.documents;
import org.librecms.ui.contenttypes.MvcArticlePropertiesStep;
import org.librecms.ui.contenttypes.MvcArticleTextBodyStep;
import java.util.HashSet;
import java.util.Set;
@ -35,9 +38,13 @@ public class CmsMvcAuthoringSteps implements MvcAuthoringSteps {
final Set<Class<?>> classes = new HashSet<>();
classes.add(ExampleAuthoringStep.class);
classes.add(CategorizationStep.class);
classes.add(PublishStep.class);
classes.add(RelatedInfoStep.class);
classes.add(MvcArticlePropertiesStep.class);
classes.add(MvcArticleTextBodyStep.class);
return classes;
}
}

84
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentController.java
View File

@ -474,32 +474,35 @@ public class DocumentController {
//
// return authoringStep.showStep();
// }
@POST
@Path("/{documentPath:(.+)?}/@authoringsteps/{authoringStep}")
@GET
@Path("/{documentPath:(.+)?}")
@AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED)
public String doEditAction(
public String editDocument(
@PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath,
@PathParam("authoringStep") final String authoringStepIdentifier,
@Context final HttpServletRequest request
@PathParam("documentPath") final String documentPath
) {
throw new UnsupportedOperationException();
}
final Optional<ContentSection> sectionResult = sectionsUi
.findContentSection(sectionIdentifier);
if (!sectionResult.isPresent()) {
return sectionsUi.showContentSectionNotFound(sectionIdentifier);
}
final ContentSection section = sectionResult.get();
@POST
@Path(
"/{documentPath:(.+)?}/@authoringsteps/{authoringStep}/{parameterPath:(.+)?}")
@AuthorizationRequired
@Transactional(Transactional.TxType.REQUIRED)
public String doEditAction(
@PathParam("sectionIdentifier") final String sectionIdentifier,
@PathParam("documentPath") final String documentPath,
@PathParam("authoringStep") final String authoringStepIdentifier,
@PathParam("parameterPath") final String parameterPath,
@Context final HttpServletRequest request
) {
throw new UnsupportedOperationException();
final Optional<ContentItem> itemResult = itemRepo
.findByPath(section, documentPath);
if (!itemResult.isPresent()) {
return documentUi.showDocumentNotFound(section, documentPath);
}
final ContentItem item = itemResult.get();
if (!permissionChecker.isPermitted(ItemPrivileges.EDIT, item)) {
return sectionsUi.showAccessDenied(
"sectionIdentifier", sectionIdentifier,
"documentPath", documentPath
);
}
return String.format("redirect:%s", findFirstAuthoringStep(item));
}
/**
@ -820,8 +823,7 @@ public class DocumentController {
item.getContentType().getContentSection().getLabel()
)
.replace(
String.format(
"{%s}",
String.format("/{%s}",
MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM
),
itemManager.getItemPath(item)
@ -891,29 +893,6 @@ public class DocumentController {
return entry;
}
/**
* An annotation literal for retrieving the authoring step with a specific
* path fragment.
*/
private static class AuthoringStepPathFragmentLiteral
extends AnnotationLiteral<AuthoringStepPathFragment>
implements AuthoringStepPathFragment {
private static final long serialVersionUID = 1L;
private final String value;
public AuthoringStepPathFragmentLiteral(final String value) {
this.value = value;
}
@Override
public String value() {
return value;
}
}
/**
* Helper method for showing the "document folder not found" page if there
* is not folder for the provided path.
@ -961,19 +940,6 @@ public class DocumentController {
return "org/librecms/ui/contentsection/documents/create-step-not-available.xhtml";
}
private String showAuthoringStepNotAvailable(final String stepIdentifier) {
models.put("stepIdentifier", stepIdentifier);
return "org/librecms/ui/contentsection/documents/authoringstep-not-available.xhtml";
}
private String showUnsupportedDocumentType(
final String stepIdentifier, final String documentType
) {
models.put("stepIdentifier", stepIdentifier);
models.put("documentType", documentType);
return "org/librecms/ui/contentsection/documents/unsupportedDocumentType.xhtml";
}
private CreateStepResult findCreateStep(
final String sectionIdentifier,
final String folderPath,

10
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/MvcAuthoringStepService.java
View File

@ -184,9 +184,8 @@ public class MvcAuthoringStepService {
section.getLabel()
)
.replace(
String.format(
"{%s}",
MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM
String.format("{%s}",
MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME
),
documentPath
)
@ -232,9 +231,8 @@ public class MvcAuthoringStepService {
section.getLabel()
)
.replace(
String.format(
"{%s}",
MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM
String.format("{%s}",
MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME
),
documentPath
)

4
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/MvcAuthoringSteps.java
View File

@ -32,7 +32,9 @@ public interface MvcAuthoringSteps {
public static final String SECTION_IDENTIFIER_PATH_PARAM
= "sectionIdentifier";
public static final String DOCUMENT_PATH_PATH_PARAM = "documentPath";
public static final String DOCUMENT_PATH_PATH_PARAM_NAME = "documentPath";
public static final String DOCUMENT_PATH_PATH_PARAM = DOCUMENT_PATH_PATH_PARAM_NAME + ":(.+)?";
Set<Class<?>> getClasses();

4
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/PublishStep.java
View File

@ -106,7 +106,7 @@ public class PublishStep {
public String showStep(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -208,7 +208,7 @@ public class PublishStep {
public String publish(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@FormParam("selectedLifecycleDefUuid")
final String selectedLifecycleDefUuid,

60
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/RelatedInfoStep.java
View File

@ -256,7 +256,7 @@ public class RelatedInfoStep {
public String showStep(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -314,7 +314,7 @@ public class RelatedInfoStep {
public List<AssetFolderTreeNode> getAssetFolderTree(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -356,7 +356,7 @@ public class RelatedInfoStep {
public List<AssetFolderRowModel> getAssetsInFolder(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("folderPath")
final String folderPath,
@ -425,7 +425,7 @@ public class RelatedInfoStep {
public List<AssetFolderRowModel> findAssets(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@QueryParam("firstResult")
@DefaultValue("0")
@ -475,7 +475,7 @@ public class RelatedInfoStep {
public List<DocumentFolderTreeNode> getDocumentFolderTree(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -517,7 +517,7 @@ public class RelatedInfoStep {
public List<DocumentFolderRowModel> getDocumentsInFolder(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("folderPath")
final String folderPath,
@ -590,7 +590,7 @@ public class RelatedInfoStep {
public List<DocumentFolderRowModel> findDocuments(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@QueryParam("firstResult")
@DefaultValue("0")
@ -642,7 +642,7 @@ public class RelatedInfoStep {
public String addAttachmentList(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@FormParam("listName")
final String name,
@ -702,7 +702,7 @@ public class RelatedInfoStep {
public String showAttachmentListDetails(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam
@ -753,7 +753,7 @@ public class RelatedInfoStep {
public String updateAttachmentList(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -813,7 +813,7 @@ public class RelatedInfoStep {
public String removeAttachmentList(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -869,7 +869,7 @@ public class RelatedInfoStep {
public String addAttachmentListTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -930,7 +930,7 @@ public class RelatedInfoStep {
public String updateAttachmentListTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -991,7 +991,7 @@ public class RelatedInfoStep {
public String removeAttachmentListTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1049,7 +1049,7 @@ public class RelatedInfoStep {
public String addAttachmentListDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1110,7 +1110,7 @@ public class RelatedInfoStep {
public String updateAttachmentListDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1170,7 +1170,7 @@ public class RelatedInfoStep {
public String removeAttachmentListDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1228,7 +1228,7 @@ public class RelatedInfoStep {
public String createAttachment(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1293,7 +1293,7 @@ public class RelatedInfoStep {
public String createInternalLink(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam
@ -1350,7 +1350,7 @@ public class RelatedInfoStep {
public String createInternalLink(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1425,7 +1425,7 @@ public class RelatedInfoStep {
public String showInternalLinkDetails(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1501,7 +1501,7 @@ public class RelatedInfoStep {
public String updateInternalLinkTarget(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1589,7 +1589,7 @@ public class RelatedInfoStep {
public String addInternalLinkTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1672,7 +1672,7 @@ public class RelatedInfoStep {
public String updateInternalLinkTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1755,7 +1755,7 @@ public class RelatedInfoStep {
public String removeInternalLinkTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1838,7 +1838,7 @@ public class RelatedInfoStep {
public String removeAttachment(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -1910,7 +1910,7 @@ public class RelatedInfoStep {
public String moveListUp(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam
@ -1963,7 +1963,7 @@ public class RelatedInfoStep {
public String moveListDown(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam
@ -2018,7 +2018,7 @@ public class RelatedInfoStep {
public String moveAttachmentUp(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,
@ -2086,7 +2086,7 @@ public class RelatedInfoStep {
public String moveAttachmentDown(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("attachmentListIdentifier")
final String listIdentifierParam,

18
ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java
View File

@ -59,7 +59,7 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Path(MvcAuthoringSteps.PATH_PREFIX + "/@basicproperties")
@Path(MvcAuthoringSteps.PATH_PREFIX + "basicproperties")
@Controller
@Named("CmsArticlePropertiesStep")
@MvcAuthoringStep(
@ -115,7 +115,7 @@ public class MvcArticlePropertiesStep {
public String showStep(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -161,7 +161,7 @@ public class MvcArticlePropertiesStep {
public String updateName(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@FormParam("name") @DefaultValue("") final String name
) {
@ -247,7 +247,7 @@ public class MvcArticlePropertiesStep {
public String addTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam,
@FormParam("value") final String value
@ -290,7 +290,7 @@ public class MvcArticlePropertiesStep {
@Transactional(Transactional.TxType.REQUIRED)
public String editTitle(
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam,
@FormParam("value") final String value
@ -333,7 +333,7 @@ public class MvcArticlePropertiesStep {
public String removeTitle(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam
) {
@ -415,7 +415,7 @@ public class MvcArticlePropertiesStep {
public String addDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@FormParam("locale") final String localeParam,
@FormParam("value") final String value
@ -459,7 +459,7 @@ public class MvcArticlePropertiesStep {
public String editDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam,
@FormParam("value") final String value
@ -502,7 +502,7 @@ public class MvcArticlePropertiesStep {
public String removeDescription(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam
) {

10
ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java
View File

@ -55,7 +55,7 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Path(MvcAuthoringSteps.PATH_PREFIX + "/@text")
@Path(MvcAuthoringSteps.PATH_PREFIX + "text")
@Controller
@Named("CmsArticleTextBodyStep")
@MvcAuthoringStep(
@ -96,7 +96,7 @@ public class MvcArticleTextBodyStep {
public String showStep(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath
) {
try {
@ -170,7 +170,7 @@ public class MvcArticleTextBodyStep {
public String addTextValue(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@FormParam("locale") final String localeParam,
@FormParam("value") final String value
@ -214,7 +214,7 @@ public class MvcArticleTextBodyStep {
public String editTextValue(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam,
@FormParam("value") final String value
@ -257,7 +257,7 @@ public class MvcArticleTextBodyStep {
public String remvoeTextValue(
@PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM)
final String sectionIdentifier,
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM)
@PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME)
final String documentPath,
@PathParam("locale") final String localeParam
) {

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documentfolder/documentfolder.xhtml
View File

@ -286,7 +286,7 @@
<a href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documentfolders/#{row.folderPath}">#{row.name}</a>
</c:when>
<c:when test="#{row.permissions.grantedApprove or row.permissions.grantedCategorize or row.permissions.grantedEdit or row.permissions.grantedPreview or row.permissions.grantedPublish}">
<a href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{row.folderPath}/#{row.name}">#{row.name}</a>
<a href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{DocumentFolderModel.pathWithTrailingSlash}#{row.name}">#{row.name}</a>
</c:when>
<c:otherwise>
<span>#{row.name}</span>

4
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml
View File

@ -77,9 +77,9 @@
value="#{mvc.basePath}/documents/#{CmsSelectedDocumentModel.itemPath}/@authoringsteps/#{authoringStep}" />
<button class="btn btn-secondary"
type="submit">
#{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.takeover']}: }
</a>
#{CmsAdminMessages['contentsection.document.authoring.workflow.active_task.takeover']}
</button>
</form>
</c:when>
<c:when test="#{CmsSelectedDocumentModel.currentTask.assignedToCurrentUser or CmsSelectedDocumentModel.canChangeWorkflow}">
<form action="#{mvc.basePath}/documents/#{CmsSelectedDocumentModel.itemPath}/@workflow/tasks/UUID-#{CmsSelectedDocumentModel.currentTask.taskUuid}/@lock">