inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
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
This commit is contained in:
Andrei Rebegea
2017-06-15 11:23:32 +00:00
parent ad1f01c12f
commit 403c946979
1 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
View File

@@ -1,28 +1,28 @@
/* /*
* #%L * #%L
* Alfresco Repository WAR Community * Alfresco Repository WAR Community
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2016 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * 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 * 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 * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.web.bean.admin; package org.alfresco.web.bean.admin;
import java.io.Serializable; import java.io.Serializable;
@@ -107,6 +107,7 @@ public class AdminNodeBrowseBean implements Serializable
transient private DataModel properties = null; transient private DataModel properties = null;
transient private DataModel children = null; transient private DataModel children = null;
transient private DataModel assocs = null; transient private DataModel assocs = null;
transient private DataModel sourceAssocs = null;
transient private DataModel permissions = null; transient private DataModel permissions = null;
transient private DataModel permissionMasks = null; transient private DataModel permissionMasks = null;
@@ -454,6 +455,28 @@ public class AdminNodeBrowseBean implements Serializable
return assocs; return assocs;
} }
/**
* Gets the current source associations
*
* @return associations
*/
public DataModel getSourceAssocs()
{
if (sourceAssocs == null)
{
try
{
List<AssociationRef> 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 * Gets the current query language
* *
@@ -588,6 +611,19 @@ public class AdminNodeBrowseBean implements Serializable
return "success"; 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 * Action to select node property
* *