Merge branch 'V20220110.patch' into computing

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;

templates/repo/repo_name.tmpl

@@ -1,6 +1,6 @@
-<div class="inline required field {{if .Err_Alias}}error{{end}}" >
+<div class="inline required field {{if .Err_RepoName}}error{{end}}" >
         <label for="Alias">{{.i18n.Tr "form.Alias"}}</label>
-        <input id="alias" name="alias" value="{{.alias}}" autofocus required>
+        <input id="alias" name="alias" value="{{.alias}}" autofocus required maxlength="100">
         <span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
     </div>
 
@@ -36,7 +36,7 @@
          <div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 0px;text-align: center;">/</div>
         <div class="required field {{if .Err_RepoName}}error{{end}}">
             <!-- <label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label> -->
-            <input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
+            <input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.repo_name}}" maxlength="100" autofocus required>
             
         </div>
         
@@ -46,7 +46,7 @@
     <div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
         <label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
     
-            <span></span>
+            <span style="flex: 1;"></span>
         
         
         

templates/repo/settings/options.tmpl

@@ -18,11 +18,7 @@
 				</div> -->
 				<div class="required field {{if .Err_Alias}}error{{end}}">
 					<label for="Alias">{{.i18n.Tr "form.Alias"}}</label>
-					{{if .Err_Alias}}
-					<input  name="alias" value="{{.Alias}}" data-repo-name="{{.Repository.Alias}}" autofocus required>
-					{{else}}
 					<input  name="alias" value="{{.Repository.Alias}}" data-repo-name="{{.Repository.Alias}}" autofocus required>
-					{{end}}
 					<span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
 				</div>
 
@@ -39,7 +35,7 @@
 							</div>
 						</div>
 						<div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 38px;text-align: center;">/</div>
-						<div class="eight wide required field {{if .Err_RepoName}}error{{end}}">
+						<div class="eight wide required field {{if .Err_Alias}}error{{end}}">
 							<!-- <label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label> -->
 							<input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
 							<span class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
@@ -79,7 +75,7 @@
 				{{end}}
 				<div class="field {{if .Err_Description}}error{{end}}">
 					<label for="description">{{$.i18n.Tr "repo.repo_desc"}}</label>
-					<textarea id="description" name="description" rows="2" maxlength="255">{{.Repository.Description}}</textarea>
+					<textarea id="description" name="description" rows="2" maxlength="254">{{.Repository.Description}}</textarea>
 				</div>
 				<div class="field {{if .Err_Website}}error{{end}}">
 					<label for="website">{{.i18n.Tr "repo.settings.site"}}</label>
@@ -190,7 +186,7 @@
 				{{$isModelMangeEnabled := .Repository.UnitEnabled $.UnitTypeModelManage }}
 				<div class="inline field">
 					<label>{{.i18n.Tr "repo.model_manager"}}</label>
-					<div class="ui checkbox {{if ne $.MODEL_COUNT 0}}disabled{{end}}">
+					<div class="ui checkbox">
 						<input class="enable-system" name="enable_model_manager" type="checkbox" {{if $isModelMangeEnabled}}checked{{end}}>
 						<label>{{.i18n.Tr "repo.settings.model_desc"}}</label>
 					</div>
@@ -198,7 +194,7 @@
 				{{$isCloudBrainEnabled := .Repository.UnitEnabled $.UnitTypeCloudBrain }}
 				<div class="inline field">
 					<label>{{.i18n.Tr "repo.cloudbrain"}}</label>
-					<div class="ui checkbox {{if ne $.jobCount 0}}disabled{{end}}">
+					<div class="ui checkbox">
 						<input class="enable-system" name="enable_cloud_brain" type="checkbox" {{if $isCloudBrainEnabled}}checked{{end}}>
 						<label>{{.i18n.Tr "repo.settings.cloudbrain_desc"}}</label>
 					</div>
@@ -663,4 +659,4 @@
 	{{end}}
 {{end}}
 
-{{template "base/footer" .}}
+{{template "base/footer" .}}

templates/user/dashboard/issues.tmpl

@@ -107,7 +107,7 @@
 						{{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }}
 						{{if .Repo}}
 						<li class="item">
-							<div class="ui label">{{.Repo.FullName}}#{{.Index}}</div>
+							<div class="ui label">{{.Repo.OwnerName}}/{{.Repo.Alias}}#{{.Index}}</div>
 							<a class="title" href="{{.HTMLURL}}">{{RenderEmoji .Title}}</a>
 
 							{{if .IsPull}}
@@ -208,3 +208,6 @@
 	</div>
 </div>
 {{template "base/footer" .}}
+<script>
+console.log({{.Issues}})
+</script>

templates/user/dashboard/milestones.tmpl

@@ -65,7 +65,7 @@
                 <div class="milestone list">
                     {{range .Milestones}}
                         <li class="item">
-                            <div class="ui label">{{.Repo.FullName}}</div>
+                            <div class="ui label">{{.Repo.OwnerName}}/{{.Repo.Alias}}</div>
 							{{svg "octicon-milestone" 16}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a>
                             <div class="ui right green progress" data-percent="{{.Completeness}}">
                                 <div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}>
@@ -117,3 +117,6 @@
 	</div>
 </div>
 {{template "base/footer" .}}
+<script>
+console.log({{.Milestones}})
+</script>

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","")
+      })
     }
   });