diff --git a/public/home/home.js b/public/home/home.js index 873b25e21..9598c65d7 100644 --- a/public/home/home.js +++ b/public/home/home.js @@ -39,11 +39,8 @@ if(document.location.host == "git.openi.org.cn" || document.URL.startsWith("http var socket = new WebSocket(url); socket.onopen = function () { -<<<<<<< HEAD -======= messageQueue = []; console.log("message has connected."); ->>>>>>> d8f60f5956f6231d090317f3af9532881ad4b332 }; var maxSize = 20; diff --git a/templates/repo/repo_name.tmpl b/templates/repo/repo_name.tmpl index 82eb6cf89..1ecd4ab1a 100644 --- a/templates/repo/repo_name.tmpl +++ b/templates/repo/repo_name.tmpl @@ -1,6 +1,6 @@ -
+
- + {{.i18n.Tr "form.reponame_dash_dot_error"}}
@@ -36,7 +36,7 @@
/
- +
@@ -46,7 +46,7 @@ -->
- {{if .Err_Alias}} - - {{else}} - {{end}} {{.i18n.Tr "form.reponame_dash_dot_error"}}
@@ -39,7 +35,7 @@
/
-
+
{{.i18n.Tr "form.repoadd_dash_dot_error"}} @@ -79,7 +75,7 @@ {{end}}
- +
@@ -190,7 +186,7 @@ {{$isModelMangeEnabled := .Repository.UnitEnabled $.UnitTypeModelManage }}
-
+
@@ -198,7 +194,7 @@ {{$isCloudBrainEnabled := .Repository.UnitEnabled $.UnitTypeCloudBrain }}
-
+
@@ -663,4 +659,4 @@ {{end}} {{end}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 6334ea3dc..85d1fb65c 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -107,7 +107,7 @@ {{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} {{if .Repo}}
  • -
    {{.Repo.FullName}}#{{.Index}}
    +
    {{.Repo.OwnerName}}/{{.Repo.Alias}}#{{.Index}}
    {{RenderEmoji .Title}} {{if .IsPull}} @@ -208,3 +208,6 @@
  • {{template "base/footer" .}} + \ No newline at end of file diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 2a4226e92..1c0ee84fc 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -65,7 +65,7 @@
    {{range .Milestones}}
  • -
    {{.Repo.FullName}}
    +
    {{.Repo.OwnerName}}/{{.Repo.Alias}}
    {{svg "octicon-milestone" 16}} {{.Name}}
    @@ -117,3 +117,6 @@
    {{template "base/footer" .}} + \ No newline at end of file diff --git a/web_src/js/index.js b/web_src/js/index.js index 4c5271973..41e717011 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2966,10 +2966,21 @@ $(document).ready(async () => { const $cloneAddr = $('#clone_addr'); $cloneAddr.on('change', () => { - const $repoName = $('#repo_name'); + const $repoName = $('#alias'); + const $owner = $('#ownerDropdown div.text').attr("title") + const $urlAdd = location.href.split('/')[0] + '//' + location.href.split('/')[2] if ($cloneAddr.val().length > 0 && $repoName.val().length === 0) { // Only modify if repo_name input is blank + const repoValue = $cloneAddr.val().match(/^(.*\/)?((.+?)(\.git)?)$/)[3] $repoName.val($cloneAddr.val().match(/^(.*\/)?((.+?)(\.git)?)$/)[3]); + $.get(`${window.config.AppSubUrl}/repo/check_name?q=${repoValue}&owner=${$owner}`,(data)=>{ + const repo_name = data.name + $('#repo_name').val(repo_name) + repo_name && $('#repo_name').parent().removeClass('error') + $('#repoAdress').css("display","flex") + $('#repoAdress span').text($urlAdd+'/'+$owner+'/'+$('#repo_name').val()+'.git') + $('#repo_name').attr("placeholder","") + }) } });