added support for framed portlets

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-deploy@92534 82a268e6-3cf1-43bd-a215-b396298e98cf
master
Massimiliano Assante 10 years ago
parent c94c6ead61
commit 20259dfc81

@ -772,7 +772,11 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
log.debug("---Sending Report, globalState --- " + report.getStatus() );
return convertServiceDeployReport(report);
}
/**
* update the ApplicationProfile of the calendar for this scope
* @param vreScope
* @param vreURL
*/
private void updateCalendarApplicationProfile(String vreScope, String vreURL) {
String appId = "org.gcube.portal.calendarwrapper.GCubeCalendarHandler";
@ -1192,13 +1196,13 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
//however the VRE-Designer and the VRE-Manager persons of the VRE could be different and need to be created too
UserManager uman = new LiferayUserManager();
Role created = null;
//if the manager is not the one who triggered the creation
if (manager.compareTo(getASLSession().getUsername()) != 0) {
//add the role VRE-Manager
long uid = Long.parseLong(uman.getUserId(manager));
created = createRole("VRE-Manager", vreName, uid);
Role created = createRole("VRE-Manager", vreName, uid);
log.debug("Admin Role "+ created.getName() + " Created Successfully");
Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid);
@ -1218,8 +1222,8 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
if (designer.compareTo(manager) != 0) {
//add the role VRE-Designer
long uid = Long.parseLong(uman.getUserId(designer));
log.debug("Admin Role "+ created.getName() + " Read Successfully");
Role created = createRole("VRE-Designer", vreName, uid);
log.debug("Admin Role "+ created.getName() + " Created Successfully");
Organization toReturn = OrganizationLocalServiceUtil.getOrganization(groupModelid);
Group vreCreated = toReturn.getGroup();
@ -1509,7 +1513,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
new GCUBEPortlet("Resources Management", PortletsIdManager.getLRPortletId(PortletsIdManager.RESOURCES_MANAGEMENT))));
else
siteLayout.addTab(new GCUBELayoutTab("Calendar", GCUBELayoutType.ONE_COL,
new GCUBEPortlet("Calendar", PortletsIdManager.getLRPortletId(PortletsIdManager.LR_CALENDAR))));
new GCUBEPortlet("Calendar", PortletsIdManager.getLRPortletId(PortletsIdManager.LR_CALENDAR)), true));
return siteLayout;
}

Loading…
Cancel
Save