Skip to content

The Unified and Autonomous Development Platform

Working on "clone project" ui

Andrea Del Bene18910294f9af
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
index ef94babef6..dc3f0a3b8b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
@@ -1,9 +1,7 @@
package io.onedev.server.entitymanager;
import javax.annotation.Nullable;
-
import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.model.Build;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
@@ -12,8 +10,8 @@ import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestComment;
public interface UrlManager {
@@ -38,5 +36,7 @@ public interface UrlManager {
String urlFor(CodeComment comment, @Nullable PullRequest request);
String urlFor(CodeCommentReply reply, @Nullable PullRequest request);
+
+ String sshUrlFor(Project project);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index 3fcf746ac1..8912267984 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -1,16 +1,12 @@
package io.onedev.server.web;
import java.util.List;
-
import javax.inject.Inject;
import javax.inject.Singleton;
-
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.eclipse.jgit.lib.ObjectId;
-
import com.google.common.base.Splitter;
-
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Build;
@@ -42,6 +38,11 @@ public class DefaultUrlManager implements UrlManager {
public String urlFor(Project project) {
return configManager.getSystemSetting().getServerUrl() + "/projects/" + project.getName();
}
+
+ @Override
+ public String sshUrlFor(Project project) {
+ return configManager.getSystemSetting().getServerSshUrl() + "/" + project.getName() + ".git";
+ }
@Override
public String urlFor(CodeComment comment, PullRequest request) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
index cf5b07bdf4..27f9a6022f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
@@ -23,6 +23,13 @@
<a wicket:id="copyUrl" class="input-group-addon"><i class="fa fa-clipboard"></i></a>
</div>
</div>
+ <div class="clone form-inline">
+ <div class="input-group">
+ <div class="input-group-addon"><b>Clone</b></div>
+ <input wicket:id="cloneSshUrl" readonly="readonly" class="form-control"/>
+ <a wicket:id="copySshUrl" class="input-group-addon"><i class="fa fa-clipboard"></i></a>
+ </div>
+ </div>
</wicket:enclosure>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
index b585a20f69..bd7c2c4772 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
@@ -14,7 +14,6 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Project;
@@ -127,10 +126,16 @@ public abstract class ProjectInfoPanel extends Panel {
}
UrlManager urlManager = OneDev.getInstance(UrlManager.class);
+
Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));
add(new TextField<String>("cloneUrl", cloneUrlModel)
.setVisible(SecurityUtils.canReadCode(getProject())));
add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
+
+ Model<String> cloneSshUrlModel = Model.of(urlManager.sshUrlFor(getProject()));
+ add(new TextField<String>("cloneSshUrl", cloneSshUrlModel)
+ .setVisible(SecurityUtils.canReadCode(getProject())));
+ add(new WebMarkupContainer("copySshUrl").add(new CopyClipboardBehavior(cloneSshUrlModel)));
}
private Project getProject() {