Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -rcc244cf148f0b2c246c5b6c588a9b843331b7e33 -rbf306b54c2487d811491af90f40f523b84e02600 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision cc244cf148f0b2c246c5b6c588a9b843331b7e33) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision bf306b54c2487d811491af90f40f523b84e02600) @@ -598,9 +598,7 @@ } } public WorkspaceFolder createFolder(Integer parentFolderID, String name, Integer userID) throws UserException,WorkspaceFolderException{ - WorkspaceFolder parentFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,parentFolderID); - User user =null; - Workspace workspace =null; + WorkspaceFolder parentFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,parentFolderID); if(parentFolder!=null){ @@ -613,17 +611,17 @@ break; } - user = (User)baseDAO.find(User.class,userID); + //set type of the new workspaceFolder + Integer newWorkspaceFolderType = parentFolder.getWorkspaceFolderType().equals(WorkspaceFolder.PUBLIC_SEQUENCES) + ? WorkspaceFolder.PUBLIC_SEQUENCES + : WorkspaceFolder.NORMAL; + + User user = (User)baseDAO.find(User.class,userID); if(user!=null){ - workspace = user.getWorkspace(); - WorkspaceFolder workspaceFolder = new WorkspaceFolder(name, - workspace.getWorkspaceId(), - parentFolder, - userID, - new Date(), - new Date(), - WorkspaceFolder.NORMAL); - baseDAO.insert(workspaceFolder); + Workspace workspace = user.getWorkspace(); + WorkspaceFolder workspaceFolder = new WorkspaceFolder(name, workspace.getWorkspaceId(), parentFolder, + userID, new Date(), new Date(), newWorkspaceFolderType); + baseDAO.insert(workspaceFolder); return workspaceFolder; }else throw new UserException(messageService.getMessage("no.such.user",new Object[]{userID}));