changed logger for getFullName from UserManagement
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@131343 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
fc2d9bc271
commit
a7b07bfb3c
|
@ -2690,7 +2690,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
|
||||||
workspaceLogger.error("UserRetrievalFault for username: "+username);
|
workspaceLogger.error("UserRetrievalFault for username: "+username);
|
||||||
|
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
workspaceLogger.error("Error during getMyLogin for username: "+username);
|
workspaceLogger.error("Error during getMyLogin for username: "+username, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,10 +63,10 @@ public class UserUtil {
|
||||||
|
|
||||||
} catch (UserManagementSystemException e) {
|
} catch (UserManagementSystemException e) {
|
||||||
|
|
||||||
logger.error("An error occurred in getUserFullName "+e,e);
|
logger.error("UserManagementSystemException, during getting fullname for: "+portalLogin);
|
||||||
} catch (UserRetrievalFault e) {
|
} catch (UserRetrievalFault e) {
|
||||||
|
|
||||||
logger.error("An error occurred in getUserFullName "+e,e);
|
logger.error("UserRetrievalFault, during getting fullname for: "+portalLogin);
|
||||||
}
|
}
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
logger.error("An error occurred in getUserFullName "+e,e);
|
logger.error("An error occurred in getUserFullName "+e,e);
|
||||||
|
@ -170,11 +170,11 @@ public class UserUtil {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the highest ckan role the user has and also retrieve the list of organizations (scopes) in which the user has the ckan-admin role
|
* Retrieve the highest ckan role the user has and also retrieve the list of organizations (scopes) in which the user has the ckan-admin role
|
||||||
* @param currentScope the current scope
|
* @param currentScope the current scope
|
||||||
* @param username the current username
|
* @param username the current username
|
||||||
* @param groupName the current groupName
|
* @param groupName the current groupName
|
||||||
* @param gcubeCkanDataCatalogServiceImpl
|
* @param gcubeCkanDataCatalogServiceImpl
|
||||||
* @param orgsInWhichAdminRole
|
* @param orgsInWhichAdminRole
|
||||||
* @param ckanUtils ckanUtils
|
* @param ckanUtils ckanUtils
|
||||||
*/
|
*/
|
||||||
public static boolean hasAdminRole(String currentScope, String username, String groupName, GWTWorkspaceServiceImpl workspaceInstance, List<OrganizationBean> orgsInWhichAdminRole){
|
public static boolean hasAdminRole(String currentScope, String username, String groupName, GWTWorkspaceServiceImpl workspaceInstance, List<OrganizationBean> orgsInWhichAdminRole){
|
||||||
|
@ -219,7 +219,7 @@ public class UserUtil {
|
||||||
if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER))
|
if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
|
checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
|
||||||
groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole);
|
groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -244,7 +244,7 @@ public class UserUtil {
|
||||||
if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER))
|
if(correspondentRoleToCheck.equals(RolesIntoOrganization.MEMBER))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
|
checkIfRoleIsSetInCkanInstance(username, gCubeGroupName, correspondentRoleToCheck, workspaceInstance,
|
||||||
groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole);
|
groupManager, gCubeGroup.getGroupId(), orgsInWhichAdminRole);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,10 +256,10 @@ public class UserUtil {
|
||||||
// get highest role
|
// get highest role
|
||||||
RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
|
RolesIntoOrganization correspondentRoleToCheck = getLiferayHighestRoleInOrg(roles);
|
||||||
|
|
||||||
// if it the role is ADMIN we have to be sure to set it
|
// if it the role is ADMIN we have to be sure to set it
|
||||||
if(correspondentRoleToCheck.equals(RolesIntoOrganization.ADMIN)){
|
if(correspondentRoleToCheck.equals(RolesIntoOrganization.ADMIN)){
|
||||||
|
|
||||||
checkIfRoleIsSetInCkanInstance(username, groupName, correspondentRoleToCheck, workspaceInstance,
|
checkIfRoleIsSetInCkanInstance(username, groupName, correspondentRoleToCheck, workspaceInstance,
|
||||||
groupManager, currentGroupId, orgsInWhichAdminRole);
|
groupManager, currentGroupId, orgsInWhichAdminRole);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -303,7 +303,7 @@ public class UserUtil {
|
||||||
boolean res = ckanUtils.checkRole(username, gCubeGroupName, correspondentRoleToCheck);
|
boolean res = ckanUtils.checkRole(username, gCubeGroupName, correspondentRoleToCheck);
|
||||||
if(res){
|
if(res){
|
||||||
|
|
||||||
// get the orgs of the user
|
// get the orgs of the user
|
||||||
List<CkanOrganization> ckanOrgs = ckanUtils.getOrganizationsByUser(username);
|
List<CkanOrganization> ckanOrgs = ckanUtils.getOrganizationsByUser(username);
|
||||||
for (CkanOrganization ckanOrganization : ckanOrgs) {
|
for (CkanOrganization ckanOrganization : ckanOrgs) {
|
||||||
if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase()) || ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){
|
if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase()) || ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){
|
||||||
|
|
Loading…
Reference in New Issue