This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8074-improve-reference-list
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit e00ccf1d21d0b34241bce4c57703a7b956c79e5e
Merge: 6f591b2 7638c6a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Dec 4 22:16:29 2018 -0500
Merging master
README.md | 2 +-
api/pom.xml | 2 +-
builder/pom.xml | 2 +-
builder/src/main/provisioning/cms.txt | 2 -
core/pom.xml | 2 +-
.../core/internal/models/ReferenceOperation.java | 11 +-
docs/releases.md | 11 +-
pom.xml | 2 +-
reference/pom.xml | 4 +-
ui/pom.xml | 2 +-
ui/src/main/frontend/package.json | 2 +-
ui/src/main/frontend/src/js/cms.draggable.js | 6 +-
ui/src/main/frontend/src/js/cms.fields.js | 8 +-
ui/src/main/frontend/src/js/cms.form.js | 2 +
ui/src/main/frontend/src/js/cms.js | 48 +++++++-
ui/src/main/frontend/src/js/cms.modal.js | 25 ++--
ui/src/main/frontend/src/js/cms.table.js | 58 +++++-----
ui/src/main/frontend/src/js/cms.toggle.js | 2 +-
ui/src/main/frontend/src/js/editor.js | 67 +++++++----
.../components/cms/contenttable/contenttable.jsp | 72 ++++++------
.../components/cms/i18ntable/i18ntable.jsp | 120 ++++++++++----------
.../components/cms/optimizefile/optimizefile.jsp | 24 ++--
.../components/cms/pageeditor/pageeditor.jsp | 2 +-
.../components/cms/pagewrapper/pagewrapper.jsp | 9 +-
.../cms/versionmanager/versionmanager.jsp | 126 +++++++++++----------
.../components/editor/slingform/slingform.jsp | 15 ++-
.../libs/sling-cms/content/config/create.json | 1 +
.../libs/sling-cms/content/site/editgroup.json | 2 -
.../libs/sling-cms/content/static/content.json | 2 +-
.../libs/sling-cms/content/template/create.json | 1 -
vagrant/Vagrantfile | 2 +-
31 files changed, 371 insertions(+), 263 deletions(-)
diff --cc
core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
index 311a8d1,4253f75..1119c8c
---
a/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
+++
b/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferenceOperation.java
@@@ -81,6 -83,7 +83,8 @@@ public abstract class ReferenceOperatio
log.debug("Finding references to {}", resource.getPath());
String query = "SELECT * FROM [nt:base] AS s WHERE NOT
ISDESCENDANTNODE([/jcr:system/jcr:versionStorage]) AND CONTAINS(s.*, '"
+ resource.getPath() + "')";
+ Set<String> paths = new HashSet<>();
++
Iterator<Resource> resources =
resource.getResourceResolver().findResources(query, Query.JCR_SQL2);
log.debug("Checking for references with: {}", query);
while (resources.hasNext()) {
