Merge pull request #75 from ist-dresden/feature/allsites

Display all sites in site manager if requested, not only of the users tenant

Author: stoerr

commons/bundle/src/main/java/com/composum/pages/commons/model/Sites.java

@@ -10,6 +10,8 @@
 
 public class Sites extends AbstractModel {
 
+    public static final String PARAM_ALLSITES = "allSites";
+
     private transient Map<String, String> tenants;
     private transient Collection<Site> sites;
     private transient Collection<Site> templates;
@@ -37,7 +39,11 @@ public Map<String, String> getTenantOptions() {
 
     public Collection<Site> getSites() {
         if (sites == null) {
-            sites = getSiteManager().getSites(context);
+            if (Boolean.TRUE.equals(Boolean.valueOf(getContext().getRequest().getParameter(PARAM_ALLSITES)))) {
+                sites = getSiteManager().getAllSites(context);
+            } else {
+                sites = getSiteManager().getSites(context);
+            }
         }
         return sites;
     }

commons/bundle/src/main/java/com/composum/pages/commons/service/PagesSiteManager.java

@@ -242,6 +242,12 @@ public Collection<Site> getSites(@Nonnull final BeanContext context) {
         return sites;
     }
 
+    @NotNull
+    @Override
+    public Collection<Site> getAllSites(@NotNull BeanContext context) {
+        return getSites(context, getContentRoot(context.getResolver()), ResourceFilter.ALL);
+    }
+
     @Override
     public Collection<Site> getSiteTemplates(@Nonnull BeanContext context, String tenant) {
         UniqueSiteList result = new UniqueSiteList();

commons/bundle/src/main/java/com/composum/pages/commons/service/SiteManager.java

@@ -138,6 +138,18 @@ default Site createBean(@Nonnull BeanContext context, @Nonnull Resource resource
     @Nonnull
     Collection<Site> getSites(@Nonnull BeanContext context, @Nullable Resource searchRoot, @Nonnull ResourceFilter filter);
 
+
+    /**
+     * Determines all sites readable for the user, no matter what tenant.
+     *
+     * @param context the current request context
+     * @return the collection of all sites readable for the user
+     */
+    @Nonnull
+    default Collection<Site> getAllSites(@Nonnull BeanContext context) {
+        return getSites(context);
+    }
+
     /**
      * Determines all usable site templates in the context of a specific tenant.
      * This implementation uses the resolvers search path to find all site resources in a tenants application context.

stage/package/src/main/content/jcr_root/libs/composum/pages/stage/edit/css/dialogs.scss

@@ -250,6 +250,18 @@
                 }
             }
         }
+
+        &_label_allsites {
+            display: flex;
+            align-items: center;
+            margin-left: $bootstrap-spacing-h;
+
+            span {
+                padding-top: 2px;
+                margin-left: 10px;
+            }
+        }
+
     }
 }
 
@@ -356,4 +368,4 @@
             vertical-align: center;
         }
     }
-}
+}

stage/package/src/main/content/jcr_root/libs/composum/pages/stage/edit/default/site/dialog/manage/manage.jsp

@@ -1,8 +1,10 @@
 <%@page session="false" pageEncoding="utf-8" %>
 <%@taglib prefix="cpp" uri="http://sling.composum.com/cppl/1.0" %>
 <%@taglib prefix="cpn" uri="http://sling.composum.com/cpnl/1.0" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <cpp:defineFrameObjects/>
 <cpp:editDialog var="sites" type="com.composum.pages.commons.model.Sites" selector="custom" title="Manage Sites">
+    <%--@elvariable id="sites" type="com.composum.pages.commons.model.Sites"--%>
     <div class="modal-header ${dialogCssBase}_header">
         <button type="button" class="${dialogCssBase}_button-close fa fa-close"
                 data-dismiss="modal" aria-label="Close"></button>
@@ -32,6 +34,13 @@
         <button type="button" class="${dialogCssBase}_button-clone ${dialogCssBase}_button btn btn-default has-icon"
                 data-dismiss="modal" title="${cpn:i18n(slingRequest,'Clone Site')}"><i
                 class="${dialogCssBase}_icon fa fa-clone"></i>${cpn:i18n(slingRequest,'Clone')}</button>
+        <c:if test="${sites.tenantSupport}">
+            <label class="${dialogCssBase}_label_allsites tools-title"
+                   title="${cpn:i18n(slingRequest,'Also show sites that are readable even if they do not belong to your tenant(s).')}">
+                <input type="checkbox" class="${dialogCssBase}_checkbox_allsites"/>
+                <span class="title-text">${cpn:i18n(slingRequest,'All Sites')}</span>
+            </label>
+        </c:if>
         <div class="${dialogCssBase}_hints"></div>
         <button type="button" class="${dialogCssBase}_button-cancel ${dialogCssBase}_button btn btn-default"
                 data-dismiss="modal">${cpn:i18n(slingRequest,'Close')}</button>

stage/package/src/main/content/jcr_root/libs/composum/pages/stage/edit/js/dialogs.js

@@ -119,6 +119,7 @@
                     _submitButton: '_button-submit',
                     _prevButton: '_button-prev',
                     _nextButton: '_button-next',
+                    _allsitesCheckbox: '_checkbox_allsites',
                     site: {
                         base: 'composum-pages-stage-site',
                         _tile: '_tile'
@@ -1140,6 +1141,7 @@
                 this.submitForm(_.bind(function (result) {
                     pages.trigger('dialog.site.create', pages.const.event.site.created,
                         [new pages.Reference(result.name, result.path)]);
+                    pages.trigger('dialog.site.create', pages.const.event.site.select, [result.path]);
                 }, this));
             }
         });
@@ -1175,8 +1177,9 @@
 
             doSubmit: function () {
                 this.submitForm(_.bind(function (result) {
-                    pages.trigger('dialog.site.create', pages.const.event.site.created,
+                    pages.trigger('dialog.site.clone', pages.const.event.site.created,
                         [new pages.Reference(result.name, result.path)]);
+                    pages.trigger('dialog.site.clone', pages.const.event.site.select, [result.path]);
                 }, this));
             }
         });
@@ -1199,6 +1202,8 @@
                 this.$('.' + c.base + c._removeButton).click(_.bind(this.onDelete, this));
                 this.$('.' + c.base + c._openButton).click(_.bind(this.onOpen, this));
                 this.$('.' + c.base + c._cloneButton).click(_.bind(this.onClone, this));
+                this.$allsitesCheckbox = this.$('.' + c.base + c._allsitesCheckbox);
+                this.$allsitesCheckbox.bind('change', _.bind(this.reloadContent, this));
                 this.initContent();
                 var id = '.SiteManager';
                 var e = pages.const.event;
@@ -1214,7 +1219,11 @@
             },
 
             reloadContent: function () {
-                core.ajaxGet(dialogs.const.edit.url.sites.list, {}, _.bind(function (content) {
+                let url = dialogs.const.edit.url.sites.list;
+                if (this.$allsitesCheckbox.is(':checked')) {
+                    url = url + "?allSites=true";
+                }
+                core.ajaxGet(url, {}, _.bind(function (content) {
                     this.$list.html(content);
                     this.initContent();
                 }, this));