You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/11/14 13:15:46 UTC
[sling-org-apache-sling-app-cms] branch master updated (0986f22 ->
bd04069)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 0986f22 Fixing issue with SLING-8835
new 257c77a Fixing an issue if the last modified field doesn't contain a calendar
new bd04069 Correcting permissions for SLING-8835
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
builder/src/main/provisioning/cms.txt | 5 +++--
.../cms/columns/lastmodified/lastmodified.jsp | 18 ++++++++++++------
2 files changed, 15 insertions(+), 8 deletions(-)
[sling-org-apache-sling-app-cms] 01/02: Fixing an issue if the last
modified field doesn't contain a calendar
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 257c77a25b5c255266aa00f6c509a0e5b8969522
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 14 08:13:36 2019 -0500
Fixing an issue if the last modified field doesn't contain a calendar
---
.../cms/columns/lastmodified/lastmodified.jsp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
index 2811532..01c2852 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp
@@ -19,9 +19,15 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<c:set var="modifiedProperty" value="${colConfig.valueMap.subPath}jcr:lastModified" />
<c:set var="modifiedByProperty" value="${colConfig.valueMap.subPath}jcr:lastModifiedBy" />
-<fmt:formatDate var="lastModified" type = "both" dateStyle = "medium" timeStyle = "medium" value="${resource.valueMap[modifiedProperty].time}" />
-<c:set var="colValue" value="${lastModified} - ${resource.valueMap[modifiedByProperty]}" />
-<td title="${sling:encode(colValue,'HTML_ATTR')}">
- <sling:encode value="${lastModified}" mode="HTML" /><br/>
- <sling:encode value="${resource.valueMap[modifiedByProperty]}" mode="HTML" />
-</td>
\ No newline at end of file
+<c:catch var="dateEx">
+ <fmt:formatDate var="lastModified" type = "both" dateStyle = "medium" timeStyle = "medium" value="${resource.valueMap[modifiedProperty].time}" />
+ <c:set var="colValue" value="${lastModified} - ${resource.valueMap[modifiedByProperty]}" />
+ <td title="${sling:encode(colValue,'HTML_ATTR')}">
+ <sling:encode value="${lastModified}" mode="HTML" /><br/>
+ <sling:encode value="${resource.valueMap[modifiedByProperty]}" mode="HTML" />
+ </td>
+</c:catch>
+<c:if test="${dateEx != null}">
+ <td title="">
+ </td>
+</c:if>
\ No newline at end of file
[sling-org-apache-sling-app-cms] 02/02: Correcting permissions for
SLING-8835
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit bd040692f34b799f204684ae134bd2f4275aed0d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 14 08:15:38 2019 -0500
Correcting permissions for SLING-8835
---
builder/src/main/provisioning/cms.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index 6390bd9..4c2ea06 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -101,9 +101,10 @@
allow jcr:read on /
end
create service user sling-cms-transformer
- set ACL for sling-cms-metadata
+ set ACL for sling-cms-transformer
allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content
- allow jcr:read on /conf
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static
+ allow jcr:read on /
end
create service user sling-rewriter
set ACL for sling-rewriter