* Support multiple MyCollab instances on the same server without specific customization

* Support drag & drop for milestone view in ticket dashboard

Author: Hai Nguyen

mycollab-core/src/main/java/com/mycollab/core/utils/FileUtils.java

@@ -16,28 +16,54 @@
  */
 package com.mycollab.core.utils;
 
+import com.google.common.base.MoreObjects;
 import com.mycollab.core.MyCollabException;
 import com.mycollab.core.UserInvalidInputException;
-import com.google.common.base.MoreObjects;
 import org.apache.commons.io.IOUtils;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
 /**
  * @author MyCollab Ltd.
  * @since 5.0.4
  */
 public class FileUtils {
 
-    public static File getHomeFolder() {
-        String userFolder = System.getProperty("user.home");
+    private static File homeFolder;
+
+    static {
+        String userFolder = System.getProperty("user.dir");
         File homeDir = new File(userFolder + "/.mycollab");
-        FileUtils.mkdirs(homeDir);
-        return homeDir;
+        File userHomeDir = new File(System.getProperty("user.home") + "/.mycollab");
+        if (userHomeDir.exists()) {
+            try {
+                Files.move(userHomeDir.toPath(), homeDir.toPath(), REPLACE_EXISTING);
+                homeFolder = homeDir;
+            } catch (Exception e) {
+                e.printStackTrace();
+                homeFolder = userHomeDir;
+            }
+        } else {
+            if (homeDir.exists()) {
+                homeFolder = homeDir;
+            } else {
+                FileUtils.mkdirs(homeDir);
+                homeFolder = homeDir;
+            }
+        }
+    }
+
+    public static File getHomeFolder() {
+        return homeFolder;
     }
 
     public static File getUserFolder() {

mycollab-mobile/src/main/java/com/mycollab/mobile/form/view/DynaFormLayout.java

@@ -26,10 +26,7 @@
 import com.mycollab.vaadin.MyCollabUI;
 import com.mycollab.vaadin.UserUIContext;
 import com.mycollab.vaadin.ui.IFormLayoutFactory;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.ComponentContainer;
-import com.vaadin.ui.Field;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +81,7 @@ public boolean isVisibleProperty(Object propertyId) {
     }
 
     @Override
-    public ComponentContainer getLayout() {
+    public AbstractComponent getLayout() {
         VerticalLayout layout = new VerticalLayout();
         int sectionCount = dynaForm.getSectionCount();
         sectionMappings = new HashMap<>();

mycollab-mobile/src/main/java/com/mycollab/mobile/module/project/view/bug/ApproveInputView.java

@@ -110,7 +110,7 @@ static class FormLayoutFactory extends AbstractFormLayoutFactory {
             private GridFormLayoutHelper informationLayout;
 
             @Override
-            public ComponentContainer getLayout() {
+            public AbstractComponent getLayout() {
                 informationLayout = GridFormLayoutHelper.defaultFormLayoutHelper(1, 2);
                 return informationLayout.getLayout();
             }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/project/view/bug/ReOpenView.java

@@ -114,7 +114,7 @@ static class FormLayoutFactory extends AbstractFormLayoutFactory {
             private GridFormLayoutHelper informationLayout;
 
             @Override
-            public ComponentContainer getLayout() {
+            public AbstractComponent getLayout() {
                 informationLayout = GridFormLayoutHelper.defaultFormLayoutHelper(1, 3);
                 return informationLayout.getLayout();
             }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/project/view/bug/ResolvedInputView.java

@@ -113,7 +113,7 @@ class FormLayoutFactory extends AbstractFormLayoutFactory {
             private GridFormLayoutHelper informationLayout;
 
             @Override
-            public ComponentContainer getLayout() {
+            public AbstractComponent getLayout() {
                 informationLayout = GridFormLayoutHelper.defaultFormLayoutHelper(1, 3);
                 return informationLayout.getLayout();
             }

mycollab-mobile/src/main/java/com/mycollab/mobile/module/project/view/settings/ProjectMemberReadViewImpl.java

@@ -163,7 +163,7 @@ private class ProjectMemberFormLayoutFactory extends AbstractFormLayoutFactory {
         private GridFormLayoutHelper informationLayout;
 
         @Override
-        public ComponentContainer getLayout() {
+        public AbstractComponent getLayout() {
             VerticalLayout layout = new VerticalLayout();
             layout.setMargin(false);
 

mycollab-mobile/src/main/java/com/mycollab/mobile/ui/AbstractEditItemComp.java

@@ -24,8 +24,8 @@
 import com.mycollab.vaadin.ui.AdvancedEditBeanForm;
 import com.mycollab.vaadin.ui.IFormLayoutFactory;
 import com.mycollab.vaadin.ui.WrappedFormLayoutFactory;
+import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.VerticalLayout;
 
 /**
@@ -70,7 +70,7 @@ class FormLayoutFactory extends WrappedFormLayoutFactory {
         private static final long serialVersionUID = 1L;
 
         @Override
-        public ComponentContainer getLayout() {
+        public AbstractComponent getLayout() {
             VerticalLayout formAddLayout = new VerticalLayout();
             wrappedLayoutFactory = initFormLayoutFactory();
             formAddLayout.addComponent(wrappedLayoutFactory.getLayout());

mycollab-services/src/main/java/com/mycollab/module/project/ProjectTypeConstants.java

@@ -55,5 +55,7 @@ public class ProjectTypeConstants {
 
     public static final String FINANCE = "Project-Finance";
 
+    public static final String REPORTS = "Project-Reports";
+
     public static final String MEMBER = "Project-Member";
 }

mycollab-services/src/main/java/com/mycollab/module/project/domain/ProjectTicket.java

@@ -398,6 +398,7 @@ public static Task buildTask(ProjectTicket bean) {
         task.setSaccountid(bean.getsAccountId());
         task.setPriority(bean.getPriority());
         task.setAssignuser(bean.getAssignUser());
+        task.setMilestoneid(bean.getMilestoneId());
         return task;
     }
 
@@ -413,6 +414,7 @@ public static SimpleBug buildBug(ProjectTicket bean) {
         bug.setPriority(bean.getPriority());
         bug.setSaccountid(bean.getsAccountId());
         bug.setAssignuser(bean.getAssignUser());
+        bug.setMilestoneid(bean.getMilestoneId());
         return bug;
     }
 
@@ -428,6 +430,7 @@ public static Risk buildRisk(ProjectTicket bean) {
         risk.setSaccountid(bean.getsAccountId());
         risk.setPriority(bean.getPriority());
         risk.setAssignuser(bean.getAssignUser());
+        risk.setMilestoneid(bean.getMilestoneId());
         return risk;
     }
 }

mycollab-services/src/main/java/com/mycollab/module/project/domain/criteria/RiskSearchCriteria.java

@@ -41,10 +41,10 @@ public class RiskSearchCriteria extends SearchCriteria {
             new PropertyListParam("assignuser", "m_prj_risk", "assignUser"));
 
     public static final Param p_raisedUser = CacheParamMapper.register(ProjectTypeConstants.RISK, RiskI18nEnum.FORM_RAISED_BY,
-            new PropertyListParam("raiseduser", "m_prj_risk", "raisedbyuser"));
+            new PropertyListParam("createdUser", "m_prj_risk", "createdUser"));
 
     public static final Param p_duedate = CacheParamMapper.register(ProjectTypeConstants.RISK, GenericI18Enum.FORM_DUE_DATE,
-            new DateParam("duedate", "m_prj_risk", "datedue"));
+            new DateParam("dueDate", "m_prj_risk", "dueDate"));
 
     public static final Param p_raiseddate = CacheParamMapper.register(ProjectTypeConstants.RISK, GenericI18Enum.FORM_CREATED_TIME,
             new DateParam("raiseddate", "m_prj_risk", "dateraised"));