hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Claudia Juergen)

Browse Source 
- SF Patch #1619455 for SF bug #1619439 MyDSpace Group Membership Special Groups


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1717 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Claudia Juergen
2006-12-27 14:41:29 +00:00
parent e0bbc24a3e
commit 295a70a17a
3 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace/CHANGES
View File

@@ -6,6 +6,7 @@
belonging to an allready registered user. belonging to an allready registered user.
(Claudia Juergen) (Claudia Juergen)
- SF Patch #1619455 for SF bug #1619439 MyDSpace Group Membership Special Groups
- SF Patch #1606719 for feature request #1145371 Link to admin area - SF Patch #1606719 for feature request #1145371 Link to admin area
- SF Patch #1610030 for SF Bug #1076506 Item import command line option for application of template - SF Patch #1610030 for SF Bug #1076506 Item import command line option for application of template

20
dspace/src/org/dspace/app/webui/servlet/MyDSpaceServlet.java
View File

@@ -58,6 +58,7 @@ import org.dspace.content.SupervisedItem;
import org.dspace.content.WorkspaceItem; import org.dspace.content.WorkspaceItem;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.core.LogManager; import org.dspace.core.LogManager;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
import org.dspace.handle.HandleManager; import org.dspace.handle.HandleManager;
import org.dspace.workflow.WorkflowItem; import org.dspace.workflow.WorkflowItem;
@@ -580,35 +581,32 @@ public class MyDSpaceServlet extends DSpaceServlet
SQLException, AuthorizeException SQLException, AuthorizeException
{ {
log.info(LogManager.getHeader(context, "view_mydspace", "")); log.info(LogManager.getHeader(context, "view_mydspace", ""));
EPerson currentUser = context.getCurrentUser();
// FIXME: WorkflowManager should return arrays // FIXME: WorkflowManager should return arrays
List ownedList = WorkflowManager.getOwnedTasks(context, context List ownedList = WorkflowManager.getOwnedTasks(context, currentUser);
.getCurrentUser());
WorkflowItem[] owned = new WorkflowItem[ownedList.size()]; WorkflowItem[] owned = new WorkflowItem[ownedList.size()];
owned = (WorkflowItem[]) ownedList.toArray(owned); owned = (WorkflowItem[]) ownedList.toArray(owned);
// Pooled workflow items // Pooled workflow items
List pooledList = WorkflowManager.getPooledTasks(context, context List pooledList = WorkflowManager.getPooledTasks(context, currentUser);
.getCurrentUser());
WorkflowItem[] pooled = new WorkflowItem[pooledList.size()]; WorkflowItem[] pooled = new WorkflowItem[pooledList.size()];
pooled = (WorkflowItem[]) pooledList.toArray(pooled); pooled = (WorkflowItem[]) pooledList.toArray(pooled);
// User's WorkflowItems // User's WorkflowItems
WorkflowItem[] workflowItems = WorkflowItem.findByEPerson(context, WorkflowItem[] workflowItems = WorkflowItem.findByEPerson(context, currentUser);
context.getCurrentUser());
// User's PersonalWorkspace // User's PersonalWorkspace
WorkspaceItem[] workspaceItems = WorkspaceItem.findByEPerson(context, WorkspaceItem[] workspaceItems = WorkspaceItem.findByEPerson(context, currentUser);
context.getCurrentUser());
// User's authorization groups // User's authorization groups
Group[] memberships = context.getCurrentUser().getGroupMemberships(); Group[] memberships = Group.allMemberGroups(context, currentUser);
SupervisedItem[] supervisedItems = SupervisedItem.findbyEPerson( SupervisedItem[] supervisedItems = SupervisedItem.findbyEPerson(
context, context.getCurrentUser()); context, currentUser);
// Set attributes // Set attributes
request.setAttribute("mydspace.user", context.getCurrentUser()); request.setAttribute("mydspace.user", currentUser);
request.setAttribute("workspace.items", workspaceItems); request.setAttribute("workspace.items", workspaceItems);
request.setAttribute("workflow.items", workflowItems); request.setAttribute("workflow.items", workflowItems);
request.setAttribute("workflow.owned", owned); request.setAttribute("workflow.owned", owned);

30
dspace/src/org/dspace/eperson/EPerson.java
View File

@@ -40,7 +40,6 @@
package org.dspace.eperson; package org.dspace.eperson;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
@@ -838,33 +837,4 @@ public class EPerson extends DSpaceObject
// explaining to the user why the eperson cannot be deleted. // explaining to the user why the eperson cannot be deleted.
return tableList; return tableList;
} }
/**
* return an array of all of the groups that this EPerson is a member of
*
* @return Group []
* @throws SQLException
*/
public Group[] getGroupMemberships() throws SQLException
{
// special groups
Group[] specialGroups = myContext.getSpecialGroups();
List groupList = new ArrayList();
for (int i = 0; i < specialGroups.length; i++)
{
groupList.add(specialGroups[i]);
}
// primary group IDs - returned as a set of Integers
Group[] myGroups = Group.allMemberGroups(myContext, this);
for (int i = 0; i < myGroups.length; i++)
{
groupList.add(myGroups[i]);
}
return (Group[]) groupList.toArray(new Group[0]);
}
} }