|
|
|
@ -25,7 +25,6 @@ import com.fr.stable.project.ProjectConstants;
|
|
|
|
|
import com.fr.workspace.WorkContext; |
|
|
|
|
import com.fr.workspace.Workspace; |
|
|
|
|
import com.fr.workspace.WorkspaceEvent; |
|
|
|
|
import com.fr.workspace.server.vcs.VcsConfig; |
|
|
|
|
import com.fr.workspace.server.vcs.VcsOperator; |
|
|
|
|
import com.fr.workspace.server.vcs.filesystem.VcsFileSystem; |
|
|
|
|
import com.fr.workspace.server.vcs.git.config.GcConfig; |
|
|
|
@ -352,7 +351,7 @@ public class VcsHelper implements JTemplateActionListener {
|
|
|
|
|
* @return 支持返回true |
|
|
|
|
*/ |
|
|
|
|
public boolean checkV2FunctionSupport() { |
|
|
|
|
return VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); |
|
|
|
|
return !VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -361,6 +360,6 @@ public class VcsHelper implements JTemplateActionListener {
|
|
|
|
|
* @return 支持返回true |
|
|
|
|
*/ |
|
|
|
|
public boolean checkMoveFunctionSupport() { |
|
|
|
|
return !VcsConfig.getInstance().isUseV2() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); |
|
|
|
|
return VcsHelper.getInstance().isLegacyMode() && (WorkContext.getCurrent().isLocal() || WorkContext.getCurrent().isRoot()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|