From 403c9469799b066d541870524a1133d2f760fd4c Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Thu, 15 Jun 2017 11:23:32 +0000 Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2) 137126 jvonka: CLD-79 - Minor update to Cloud Admin Node Browser to show "Source Associations" - TODO merge to 5.2.N-CLOUD44 & additional change on CLOUD44 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/bean/admin/AdminNodeBrowseBean.java | 86 +++++++++++++------ 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java index fc3f32b91e..f6218e72df 100644 --- a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java +++ b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository WAR Community - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Repository WAR Community + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.web.bean.admin; import java.io.Serializable; @@ -107,6 +107,7 @@ public class AdminNodeBrowseBean implements Serializable transient private DataModel properties = null; transient private DataModel children = null; transient private DataModel assocs = null; + transient private DataModel sourceAssocs = null; transient private DataModel permissions = null; transient private DataModel permissionMasks = null; @@ -454,6 +455,28 @@ public class AdminNodeBrowseBean implements Serializable return assocs; } + /** + * Gets the current source associations + * + * @return associations + */ + public DataModel getSourceAssocs() + { + if (sourceAssocs == null) + { + try + { + List assocRefs = getNodeService().getSourceAssocs(getNodeRef(), RegexQNamePattern.MATCH_ALL); + sourceAssocs = new ListDataModel(assocRefs); + } + catch (UnsupportedOperationException err) + { + // some stores do not support associations + } + } + return sourceAssocs; + } + /** * Gets the current query language * @@ -588,6 +611,19 @@ public class AdminNodeBrowseBean implements Serializable return "success"; } + /** + * Action to select association From node + * + * @return next action + */ + public String selectFromNode() + { + AssociationRef assocRef = (AssociationRef) getSourceAssocs().getRowData(); + NodeRef sourceRef = assocRef.getSourceRef(); + setNodeRef(sourceRef); + return "success"; + } + /** * Action to select node property *