From 3c60550adb68bfcfb1e5df0ea6920aa0e344bd4a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:13:26 +0800
Subject: [PATCH 01/74] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=85=AC=E6=9C=89?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go            | 1 +
 models/user_analysis_for_activity.go | 9 +++++++++
 routers/api/v1/api.go                | 1 +
 routers/repo/ai_model_manage.go      | 5 ++++-
 routers/repo/user_data_analysis.go   | 6 ++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 5b14b9ba2..3083c4266 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -33,6 +33,7 @@ type AiModelManage struct {
 	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
 	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
 	UserId            int64              `xorm:"NOT NULL" json:"userId"`
+	IsPrivate         bool               `xorm:"DEFAULT false" json:"isPrivate"`
 	UserName          string             `json:"userName"`
 	UserRelAvatarLink string             `json:"userRelAvatarLink"`
 	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go
index 2066697d2..f52b127c6 100644
--- a/models/user_analysis_for_activity.go
+++ b/models/user_analysis_for_activity.go
@@ -449,3 +449,12 @@ func QueryUserLoginInfo(userIds []int64) []*UserLoginLog {
 
 	return loginList
 }
+
+func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear {
+	statictisSess := xStatistic.NewSession()
+	defer statictisSess.Close()
+	var re *UserSummaryCurrentYear
+	statictisSess.ID(userId).Get(re)
+
+	return re
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 14badfdb4..a6e0eb737 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -610,6 +610,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_invitation_yesterday", operationReq, repo_ext.QueryInvitationYesterday)
 		m.Get("/query_invitation_all", operationReq, repo_ext.QueryInvitationAll)
 		m.Get("/query_invitation_userdefine", operationReq, repo_ext.QueryUserDefineInvitationPage)
+		m.Get("/query_user_annual_report", repo_ext.QueryUserAnnualReport)
 
 		m.Get("/download_invitation_detail", operationReq, repo_ext.DownloadInvitationDetail)
 
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7eedb9bc4..d93905d7c 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -93,7 +93,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 	log.Info("accuracyJson=" + string(accuracyJson))
 	aiTask.ContainerIp = ""
 	aiTaskJson, _ := json.Marshal(aiTask)
-
+	isPrivate := ctx.QueryBool("isPrivate")
 	model := &models.AiModelManage{
 		ID:            id,
 		Version:       version,
@@ -114,6 +114,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
 		TrainTaskInfo: string(aiTaskJson),
 		Accuracy:      string(accuracyJson),
 		Status:        STATUS_COPY_MODEL,
+		IsPrivate:     isPrivate,
 	}
 
 	err = models.SaveModelToDb(model)
@@ -216,6 +217,7 @@ func SaveLocalModel(ctx *context.Context) {
 	description := ctx.Query("description")
 	engine := ctx.QueryInt("engine")
 	taskType := ctx.QueryInt("type")
+	isPrivate := ctx.QueryBool("isPrivate")
 	modelActualPath := ""
 	if taskType == models.TypeCloudBrainOne {
 		destKeyNamePrefix := Model_prefix + models.AttachmentRelativePath(id) + "/"
@@ -262,6 +264,7 @@ func SaveLocalModel(ctx *context.Context) {
 		TrainTaskInfo: "",
 		Accuracy:      "",
 		Status:        STATUS_FINISHED,
+		IsPrivate:     isPrivate,
 	}
 
 	err := models.SaveModelToDb(model)
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index 508addf75..a6de283a4 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -907,3 +907,9 @@ func QueryUserLoginInfo(ctx *context.Context) {
 		log.Info("writer exel error." + err.Error())
 	}
 }
+
+func QueryUserAnnualReport(ctx *context.Context) {
+	log.Info("start to QueryUserAnnualReport ")
+	result := models.QueryUserAnnualReport(ctx.User.ID)
+	ctx.JSON(http.StatusOK, result)
+}

From 7e98e054414db4a3022f07549e0076197d6b47ce Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:28:21 +0800
Subject: [PATCH 02/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=8F=8A=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../modelmanage/local/modelmanage-local-create-1.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index fefcf4114..c46fe55c6 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -85,6 +85,15 @@
               :placeholder="$t('modelManage.modelLabelInputTips')" @input="labelInput"></el-input>
           </div>
         </div>
+        <div class="row">
+          <div class="r-title"><label>模型权限</label></div>
+          <div class="r-content">
+             <el-radio-group  v-model="state.isPrivate" >
+                <el-radio-button label="true">公开</el-radio-button>
+                <el-radio-button label="false">私有</el-radio-button>
+              </el-radio-group>
+        </div>
+
         <div class="row" style="align-items:flex-start;">
           <div class="r-title"><label>{{ $t('modelManage.modelDescr') }}</label></div>
           <div class="r-content">
@@ -93,6 +102,8 @@
             </el-input>
           </div>
         </div>
+
+        </div>
         <div class="row" style="margin-top:20px">
           <div class="r-title"><label></label></div>
           <div class="r-content">
@@ -220,6 +231,7 @@ export default {
           this.state.engine = data.engine.toString();
           this.state.label = data.label;
           this.state.description = data.description;
+          this.state.isPrivate = data.isPrivate;
         }
       }).catch(err => {
         this.loading = false;

From 3128e9d67e8a12210d26c61a7af066fd3a41e57d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:31:51 +0800
Subject: [PATCH 03/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=8F=8A=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index c46fe55c6..b0876b8ac 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -85,6 +85,7 @@
               :placeholder="$t('modelManage.modelLabelInputTips')" @input="labelInput"></el-input>
           </div>
         </div>
+
         <div class="row">
           <div class="r-title"><label>模型权限</label></div>
           <div class="r-content">
@@ -92,6 +93,7 @@
                 <el-radio-button label="true">公开</el-radio-button>
                 <el-radio-button label="false">私有</el-radio-button>
               </el-radio-group>
+          </div>
         </div>
 
         <div class="row" style="align-items:flex-start;">
@@ -103,7 +105,6 @@
           </div>
         </div>
 
-        </div>
         <div class="row" style="margin-top:20px">
           <div class="r-title"><label></label></div>
           <div class="r-content">

From c311bad561c7821f3aaf5b7e12007e1f537f2597 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:38:01 +0800
Subject: [PATCH 04/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=8F=8A=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index b0876b8ac..b3c45ff01 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -157,6 +157,7 @@ export default {
       const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
       const list = this.state.label.trim().split(' ').filter(label => label != '');
       this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
+      this.state.isPrivate = false;
     },
     submit() {
       if (!this.checkName()) {

From 6fbdfdbd73aaed468a711560f1571ae02de7e694 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:43:03 +0800
Subject: [PATCH 05/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=8F=8A=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index b3c45ff01..2c3ec062b 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -90,8 +90,8 @@
           <div class="r-title"><label>模型权限</label></div>
           <div class="r-content">
              <el-radio-group  v-model="state.isPrivate" >
-                <el-radio-button label="true">公开</el-radio-button>
-                <el-radio-button label="false">私有</el-radio-button>
+                <el-radio-button label="false" selected="">公开</el-radio-button>
+                <el-radio-button label="true" >私有</el-radio-button>
               </el-radio-group>
           </div>
         </div>
@@ -157,7 +157,7 @@ export default {
       const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
       const list = this.state.label.trim().split(' ').filter(label => label != '');
       this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
-      this.state.isPrivate = false;
+      this.state.isPrivate = "false";
     },
     submit() {
       if (!this.checkName()) {

From 0cbbf90f9de9cbeec95d7d076882acda032dc673 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 16:55:12 +0800
Subject: [PATCH 06/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=8F=8A=E7=A7=81=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 2c3ec062b..b8fb9058e 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -90,8 +90,8 @@
           <div class="r-title"><label>模型权限</label></div>
           <div class="r-content">
              <el-radio-group  v-model="state.isPrivate" >
-                <el-radio-button label="false" selected="">公开</el-radio-button>
-                <el-radio-button label="true" >私有</el-radio-button>
+                <el-radio-button label="false">公开</el-radio-button>
+                <el-radio-button label="true">私有</el-radio-button>
               </el-radio-group>
           </div>
         </div>
@@ -141,6 +141,7 @@ export default {
         engine: '0',
         label: '',
         description: '',
+        isPrivate : 'false',
       },
       nameErr: false,
       isShowVersion: false,
@@ -157,7 +158,7 @@ export default {
       const hasEndSpace = this.state.label[this.state.label.length - 1] == ' ';
       const list = this.state.label.trim().split(' ').filter(label => label != '');
       this.state.label = list.slice(0, MAX_LABEL_COUNT).join(' ') + (hasEndSpace && list.length < MAX_LABEL_COUNT ? ' ' : '');
-      this.state.isPrivate = "false";
+      
     },
     submit() {
       if (!this.checkName()) {

From 00a4b5cb405826229dbc32497102dff7cc72119d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 17:30:06 +0800
Subject: [PATCH 07/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/vuepages/langs/config/en-US.js | 1 +
 web_src/vuepages/langs/config/zh-CN.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index 0488d682d..c943bf619 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -281,6 +281,7 @@ const en = {
     infoModificationFailed: 'Information modify failed',
     deleteModelFileConfirmTips: 'Are you sure you want to delete the current model file?',
     modelFileDeleteFailed: 'Model file delete failed',
+    isPrivate:'Model Access',
   },
 }
 
diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 1d915749e..3190d0a65 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -282,6 +282,7 @@ const zh = {
     infoModificationFailed: '信息修改失败',
     deleteModelFileConfirmTips: '请确认是否删除当前模型文件？',
     modelFileDeleteFailed: '模型文件删除失败',
+    isPrivate:'模型权限',
   },
 };
 

From 74019d17a96ee020ba785cfd912e57ff7b3855c7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 17:31:26 +0800
Subject: [PATCH 08/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/common/modelmanage-common-detail.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index d78a4cfec..565a27bbf 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -51,6 +51,12 @@
                 </div>
               </div>
             </div>
+            <div class="row">
+              <div class="tit">{{ $t('modelManage.isPrivate') }}：</div>
+              <div class="val">
+                <div class="txt-wrap">{{ state.isPrivate }}</div>
+              </div>
+            </div>
           </div>
           <div class="area">
             <div class="row">
@@ -298,6 +304,7 @@ export default {
       this.state._label = data.label;
       this.state.description = data.description || '--';
       this.state._description = data.description;
+      this.state.isPrivate= data.isPrivate.toString();
       this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
 
       const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';

From fdf9015c37ba280ea917fd8ea6b55f11936b2671 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 1 Dec 2022 17:41:24 +0800
Subject: [PATCH 09/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/common/modelmanage-common-detail.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 565a27bbf..5c8b419f9 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -304,7 +304,7 @@ export default {
       this.state._label = data.label;
       this.state.description = data.description || '--';
       this.state._description = data.description;
-      this.state.isPrivate= data.isPrivate.toString();
+      this.state.isPrivate= data.isPrivate == true ? '私有':'公开'
       this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
 
       const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';

From c713101fea0a5eab70bf7d54f58f3b76ddd68e2d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:08:30 +0800
Subject: [PATCH 10/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 44cc5d8cc..186d5bbd5 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -234,6 +234,23 @@
                         <input id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>    
                 </div>
+                <div class="inline fields">
+                    <div class="two wide field right aligned">
+                         <label>模型权限</label>
+                    </div>
+                    <div class="field">
+                        <div class="ui radio checkbox">
+                            <input type="radio" name="is_private" checked="checked">
+                            <label>公开</label>
+                        </div>
+                    </div>
+                    <div class="field">
+                        <div class="ui radio checkbox">
+                            <input type="radio" name="is_private">
+                            <label>私有</label>
+                        </div>
+                    </div>
+                </div>
                 <div class="inline fields">
                     <div class="two wide field right aligned">                    
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>

From 881de9b7ae303f417010b478afd360febdca49c4 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:13:23 +0800
Subject: [PATCH 11/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/create_online.tmpl | 17 +++++++++++++++++
 templates/repo/modelmanage/index.tmpl         | 18 +-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 32503d1f0..26c3a4d31 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -135,6 +135,23 @@
                                 <input class="ays-ignore" id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                             </div>    
                         </div>
+                        <div class="inline fields">
+                            <div class="two wide field right aligned">
+                                <label>模型权限</label>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="is_private" checked="checked">
+                                    <label>公开</label>
+                                </div>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="is_private">
+                                    <label>私有</label>
+                                </div>
+                            </div>
+                        </div>
                         <div class="inline fields">
                             <div class="two wide field right aligned">                    
                                 <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index 186d5bbd5..ebc4b5ca1 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -234,23 +234,7 @@
                         <input id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>    
                 </div>
-                <div class="inline fields">
-                    <div class="two wide field right aligned">
-                         <label>模型权限</label>
-                    </div>
-                    <div class="field">
-                        <div class="ui radio checkbox">
-                            <input type="radio" name="is_private" checked="checked">
-                            <label>公开</label>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <div class="ui radio checkbox">
-                            <input type="radio" name="is_private">
-                            <label>私有</label>
-                        </div>
-                    </div>
-                </div>
+                
                 <div class="inline fields">
                     <div class="two wide field right aligned">                    
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>

From 4e964a5d992b04ce54a5c1cdddf876e403c08538 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:16:27 +0800
Subject: [PATCH 12/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/create_online.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 26c3a4d31..dea8ab86d 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -137,7 +137,7 @@
                         </div>
                         <div class="inline fields">
                             <div class="two wide field right aligned">
-                                <label>模型权限</label>
+                                <label>模型权限  &nbsp</label>
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">

From c7740cf23f261870e31620eba551a0184370dd7e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:23:53 +0800
Subject: [PATCH 13/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../local/modelmanage-local-create-1.vue       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index b8fb9058e..5ea2ff23a 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -88,12 +88,20 @@
 
         <div class="row">
           <div class="r-title"><label>模型权限</label></div>
-          <div class="r-content">
-             <el-radio-group  v-model="state.isPrivate" >
-                <el-radio-button label="false">公开</el-radio-button>
-                <el-radio-button label="true">私有</el-radio-button>
-              </el-radio-group>
+          <div class="field">
+            <div class="ui radio checkbox">
+              <input type="radio" name="is_private" checked="checked">
+              <label>公开</label>
+            </div>
+          </div>
+          <div class="field">
+              <div class="ui radio checkbox">
+                <input type="radio" name="is_private">
+                <label>私有</label>
+              </div>
           </div>
+          
+         
         </div>
 
         <div class="row" style="align-items:flex-start;">

From 39a0bd8ba28a0acba6386c5d705e92fafee14ff9 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:31:54 +0800
Subject: [PATCH 14/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 5ea2ff23a..baecf0bff 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -94,6 +94,9 @@
               <label>公开</label>
             </div>
           </div>
+          <div class="field">
+              <label>&nbsp</label>
+          </div>
           <div class="field">
               <div class="ui radio checkbox">
                 <input type="radio" name="is_private">

From b2c8137721a5085c813862a8ec4991edb7719a43 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:47:56 +0800
Subject: [PATCH 15/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/create_online.tmpl        |  4 ++--
 .../modelmanage/local/modelmanage-local-create-1.vue | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index dea8ab86d..7169e2d7c 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -141,13 +141,13 @@
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">
-                                    <input type="radio" name="is_private" checked="checked">
+                                    <input type="radio" name="isPrivate" checked="checked" value="false">
                                     <label>公开</label>
                                 </div>
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">
-                                    <input type="radio" name="is_private">
+                                    <input type="radio" name="isPrivate" value="true">
                                     <label>私有</label>
                                 </div>
                             </div>
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index baecf0bff..ebae767e1 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -90,16 +90,16 @@
           <div class="r-title"><label>模型权限</label></div>
           <div class="field">
             <div class="ui radio checkbox">
-              <input type="radio" name="is_private" checked="checked">
+              <input type="radio" name="isPrivate" checked="checked" value="false">
               <label>公开</label>
             </div>
           </div>
           <div class="field">
-              <label>&nbsp</label>
+              <label>&nbsp;&nbsp;</label>
           </div>
           <div class="field">
               <div class="ui radio checkbox">
-                <input type="radio" name="is_private">
+                <input type="radio" name="isPrivate" value="true">
                 <label>私有</label>
               </div>
           </div>
@@ -179,6 +179,12 @@ export default {
         // });       
         return;
       }
+      var radio = document.getElementsByName("isPrivate");
+	    for (i=0; i<radio.length; i++) {
+		    if (radio[i].checked) {
+			    this.state.isPrivate=radio[i].value;
+		    }
+	    }
       const submintApi = this.type == '1' ? modifyModel : saveLocalModel;
       submintApi({
         repo: location.pathname.split('/').slice(0, 3).join('/'),

From 24cee53ad48ab5fa79e3c1e315f342510795a607 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 10:54:05 +0800
Subject: [PATCH 16/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../pages/modelmanage/local/modelmanage-local-create-1.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index ebae767e1..21560e724 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -180,7 +180,7 @@ export default {
         return;
       }
       var radio = document.getElementsByName("isPrivate");
-	    for (i=0; i<radio.length; i++) {
+	    for (var i=0; i<radio.length; i++) {
 		    if (radio[i].checked) {
 			    this.state.isPrivate=radio[i].value;
 		    }

From 9594ada81674f8f4d2a15f651f27f9bcf96dfbba Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 11:39:51 +0800
Subject: [PATCH 17/74] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 options/locale/locale_en-US.ini                             | 5 +++++
 options/locale/locale_zh-CN.ini                             | 5 +++++
 templates/repo/modelmanage/create_online.tmpl               | 6 +++---
 web_src/vuepages/langs/config/en-US.js                      | 4 +++-
 .../pages/modelmanage/common/modelmanage-common-detail.vue  | 2 +-
 .../pages/modelmanage/local/modelmanage-local-create-1.vue  | 6 +++---
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 647bdb1ad..bcb170f7a 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1305,6 +1305,11 @@ model.manage.select.engine=Select model engine
 model.manage.modelfile=Model file
 model.manage.modellabel=Model label
 model.manage.modeldesc=Model description
+model.manage.modelaccess=Model Access
+model.manage.modelaccess.public=Public
+model.manage.modelaccess.private=Private
+model.manage.modelaccess.setpublic=Set Public
+model.manage.modelaccess.setprivate=Set Private
 model.manage.baseinfo=Base Information
 modelconvert.notcreate=No model conversion task has been created.
 modelconvert.importfirst1=Please import the
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 8f9e6b664..d014878c2 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1318,6 +1318,11 @@ model.manage.select.engine=选择模型框架
 model.manage.modelfile=模型文件
 model.manage.modellabel=模型标签
 model.manage.modeldesc=模型描述
+model.manage.modelaccess=模型权限
+model.manage.modelaccess.public=公开
+model.manage.modelaccess.private=私有
+model.manage.modelaccess.setpublic=设为公开
+model.manage.modelaccess.setprivate=设为私有
 model.manage.baseinfo=基本信息
 modelconvert.notcreate=未创建过模型转换任务
 modelconvert.importfirst1=请您先导入
diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 7169e2d7c..968f82fc3 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -137,18 +137,18 @@
                         </div>
                         <div class="inline fields">
                             <div class="two wide field right aligned">
-                                <label>模型权限  &nbsp</label>
+                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="isPrivate" checked="checked" value="false">
-                                    <label>公开</label>
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
                                 </div>
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="isPrivate" value="true">
-                                    <label>私有</label>
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
                                 </div>
                             </div>
                         </div>
diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js
index c943bf619..9eda16e0a 100644
--- a/web_src/vuepages/langs/config/en-US.js
+++ b/web_src/vuepages/langs/config/en-US.js
@@ -281,7 +281,9 @@ const en = {
     infoModificationFailed: 'Information modify failed',
     deleteModelFileConfirmTips: 'Are you sure you want to delete the current model file?',
     modelFileDeleteFailed: 'Model file delete failed',
-    isPrivate:'Model Access',
+    modelAccess:'Model Access',
+    modelAccessPublic:'Public',
+    modelAccessPrivate:'Private',
   },
 }
 
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index 5c8b419f9..debc924fd 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -304,7 +304,7 @@ export default {
       this.state._label = data.label;
       this.state.description = data.description || '--';
       this.state._description = data.description;
-      this.state.isPrivate= data.isPrivate == true ? '私有':'公开'
+      this.state.isPrivate= (data.isPrivate == true ? this.$t('modelManage.modelAccessPrivate'):this.$t('modelManage.modelAccessPublic'));
       this.state.createTime = formatDate(new Date(data.createdUnix * 1000), 'yyyy-MM-dd HH:mm:ss');
 
       const trainTaskInfo = data.trainTaskInfo ? JSON.parse(data.trainTaskInfo) : '';
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 21560e724..eded627ca 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -87,11 +87,11 @@
         </div>
 
         <div class="row">
-          <div class="r-title"><label>模型权限</label></div>
+          <div class="r-title"><label>{{ $t('modelManage.modelAccess') }}</label></div>
           <div class="field">
             <div class="ui radio checkbox">
               <input type="radio" name="isPrivate" checked="checked" value="false">
-              <label>公开</label>
+              <label>{{ $t('modelManage.modelAccessPublic') }}</label>
             </div>
           </div>
           <div class="field">
@@ -100,7 +100,7 @@
           <div class="field">
               <div class="ui radio checkbox">
                 <input type="radio" name="isPrivate" value="true">
-                <label>私有</label>
+                <label>{{ $t('modelManage.modelAccessPrivate') }}</label>
               </div>
           </div>
           

From 0d4fd900299b4830c0d028594d0112b2fccecbc2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 11:45:03 +0800
Subject: [PATCH 18/74] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/vuepages/langs/config/zh-CN.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index 3190d0a65..355f972c9 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -282,7 +282,9 @@ const zh = {
     infoModificationFailed: '信息修改失败',
     deleteModelFileConfirmTips: '请确认是否删除当前模型文件？',
     modelFileDeleteFailed: '模型文件删除失败',
-    isPrivate:'模型权限',
+    modelAccess:'模型权限',
+    modelAccessPublic:'公开',
+    modelAccessPrivate:'私有',
   },
 };
 

From 6e0d31720fc2d5ee46d1f4b4c2974c4a71d740c0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 11:51:48 +0800
Subject: [PATCH 19/74] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl    | 17 +++++++++++++++++
 templates/repo/modelarts/trainjob/show.tmpl     | 17 +++++++++++++++++
 .../common/modelmanage-common-detail.vue        |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 69bec19e7..8b788e17c 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -647,6 +647,23 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
+                    <div class="inline fields">
+                            <div class="two wide field right aligned">
+                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" checked="checked" value="false">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                                </div>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" value="true">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                </div>
+                            </div>
+                    </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 91a9229b7..7d24e2b31 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -703,6 +703,23 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
+                    <div class="inline fields">
+                            <div class="two wide field right aligned">
+                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" checked="checked" value="false">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                                </div>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" value="true">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                </div>
+                            </div>
+                    </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index debc924fd..f87421bc1 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -52,7 +52,7 @@
               </div>
             </div>
             <div class="row">
-              <div class="tit">{{ $t('modelManage.isPrivate') }}：</div>
+              <div class="tit">{{ $t('modelManage.modelAccess') }}：</div>
               <div class="val">
                 <div class="txt-wrap">{{ state.isPrivate }}</div>
               </div>

From 5925c45cc92cacfad93348e58771a5f1db2acbb6 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 11:56:10 +0800
Subject: [PATCH 20/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 7d24e2b31..618afa4b5 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -705,7 +705,7 @@
                     </div>
                     <div class="inline fields">
                             <div class="two wide field right aligned">
-                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
+                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}</label>
                             </div>
                             <div class="field">
                                 <div class="ui radio checkbox">

From 16387c2a07c9609df5105dc1d65a8cfa7e40dfc2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 11:58:54 +0800
Subject: [PATCH 21/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 618afa4b5..aa1be21db 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -704,9 +704,9 @@
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline fields">
-                            <div class="two wide field right aligned">
-                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}</label>
-                            </div>
+                            
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}</label>
+                            
                             <div class="field">
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="isPrivate" checked="checked" value="false">

From 65a23335b2b2c95c2e67be7e9854ae509cd83613 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 12:01:25 +0800
Subject: [PATCH 22/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index aa1be21db..1c9e8ea2b 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -705,7 +705,7 @@
                     </div>
                     <div class="inline fields">
                             
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}</label>
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;</label>
                             
                             <div class="field">
                                 <div class="ui radio checkbox">

From 6883b38902704aad7837c7ddef344a7fd9f2251f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 12:02:38 +0800
Subject: [PATCH 23/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 1c9e8ea2b..435c668ba 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -705,7 +705,7 @@
                     </div>
                     <div class="inline fields">
                             
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;</label>
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;</label>
                             
                             <div class="field">
                                 <div class="ui radio checkbox">

From afab72c92162454bc3caec6a523a2a0b313af666 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 14:28:03 +0800
Subject: [PATCH 24/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 435c668ba..1b287e461 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -705,7 +705,7 @@
                     </div>
                     <div class="inline fields">
                             
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;</label>
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
                             
                             <div class="field">
                                 <div class="ui radio checkbox">

From 983ff3b0cbd4d849687354c2cc5aa4d3dba17ffa Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 14:31:15 +0800
Subject: [PATCH 25/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl |  6 +++---
 templates/repo/grampus/trainjob/show.tmpl    | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index 8b788e17c..b3f796c67 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -648,9 +648,9 @@
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
                     <div class="inline fields">
-                            <div class="two wide field right aligned">
-                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
-                            </div>
+                            
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
+                            
                             <div class="field">
                                 <div class="ui radio checkbox">
                                     <input type="radio" name="isPrivate" checked="checked" value="false">
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 9d46a5256..d07c870e2 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -679,6 +679,23 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
+                    <div class="inline fields">
+                            
+                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
+                            
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" checked="checked" value="false">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                                </div>
+                            </div>
+                            <div class="field">
+                                <div class="ui radio checkbox">
+                                    <input type="radio" name="isPrivate" value="true">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                </div>
+                            </div>
+                    </div>
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"

From 09c581d64c97721d75f44ec27f356d9ebb00023a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 14:45:59 +0800
Subject: [PATCH 26/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelarts/trainjob/show.tmpl | 32 +++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index 1b287e461..fd1959cd6 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -703,23 +703,25 @@
                         <input style="width: 83%;margin-left: 7px;" id="label" name="label" maxlength="255"
                             placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                     </div>
-                    <div class="inline fields">
-                            
-                            <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
-                            
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" checked="checked" value="false">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                    {{if eq $.Repository.IsPrivate false}}
+                        <div class="inline fields">
+                                
+                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}&nbsp;&nbsp;&nbsp;</label>
+                                
+                                <div class="field">
+                                    <div class="ui radio checkbox">
+                                        <input type="radio" name="isPrivate" checked="checked" value="false">
+                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" value="true">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                <div class="field">
+                                    <div class="ui radio checkbox">
+                                        <input type="radio" name="isPrivate" value="true">
+                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                    </div>
                                 </div>
-                            </div>
-                    </div>
+                        </div>
+                    {{end}}
                     <div class="inline field">
                         <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}}</label>
                         <textarea style="width: 83%;margin-left: 7px;" id="description" name="description" rows="3"

From ce1cb450446d015c5af171d413d2948db10c70eb Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 15:13:33 +0800
Subject: [PATCH 27/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 .../repo/modelmanage/create_local_1.tmpl      |  1 +
 templates/repo/modelmanage/create_online.tmpl | 30 ++++++++++---------
 .../local/modelmanage-local-create-1.vue      | 19 +++++++-----
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/templates/repo/modelmanage/create_local_1.tmpl b/templates/repo/modelmanage/create_local_1.tmpl
index 965221335..ed47a907e 100644
--- a/templates/repo/modelmanage/create_local_1.tmpl
+++ b/templates/repo/modelmanage/create_local_1.tmpl
@@ -2,6 +2,7 @@
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-modelmanage-local-create-1.css?v={{MD5 AppVer}}" />
 <div class="repository release dataset-list view">
     {{template "repo/header" .}}
+    <script>var REPO_IS_PRIVATE = {{$.Repository.IsPrivate}};</script>
     <div class="ui container">
         <div id="__vue-root"></div>
     </div>    
diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 968f82fc3..78e51450c 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -135,23 +135,25 @@
                                 <input class="ays-ignore" id="label" name="label" maxlength="255" placeholder='{{.i18n.Tr "repo.modelarts.train_job.label_place"}}'>
                             </div>    
                         </div>
-                        <div class="inline fields">
-                            <div class="two wide field right aligned">
-                                <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
-                            </div>
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" checked="checked" value="false">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                        {{if eq $.Repository.IsPrivate false}}
+                            <div class="inline fields">
+                                <div class="two wide field right aligned">
+                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess"}}  &nbsp</label>
                                 </div>
-                            </div>
-                            <div class="field">
-                                <div class="ui radio checkbox">
-                                    <input type="radio" name="isPrivate" value="true">
-                                    <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                <div class="field">
+                                    <div class="ui radio checkbox">
+                                        <input type="radio" name="isPrivate" checked="checked" value="false">
+                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.public"}}</label>
+                                    </div>
+                                </div>
+                                <div class="field">
+                                    <div class="ui radio checkbox">
+                                        <input type="radio" name="isPrivate" value="true">
+                                        <label>{{.i18n.Tr "repo.model.manage.modelaccess.private"}}</label>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        {{end}}
                         <div class="inline fields">
                             <div class="two wide field right aligned">                    
                                 <label for="description">{{.i18n.Tr "repo.model.manage.modeldesc"}} &nbsp</label>
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index eded627ca..67d0e6349 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -86,7 +86,7 @@
           </div>
         </div>
 
-        <div class="row">
+        <div class="row" v-if="repoIsPrivate==false">
           <div class="r-title"><label>{{ $t('modelManage.modelAccess') }}</label></div>
           <div class="field">
             <div class="ui radio checkbox">
@@ -139,7 +139,7 @@ import { MODEL_ENGINES } from '~/const'
 
 const REPO_NAME = location.pathname.split('/')[2];
 const MAX_LABEL_COUNT = 5;
-
+const REPOISPRIVATE = window.REPO_IS_PRIVATE;
 export default {
   data() {
     return {
@@ -157,6 +157,7 @@ export default {
       nameErr: false,
       isShowVersion: false,
       engineList: MODEL_ENGINES,
+      repoIsPrivate:  REPOISPRIVATE
     };
   },
   components: {},
@@ -180,11 +181,15 @@ export default {
         return;
       }
       var radio = document.getElementsByName("isPrivate");
-	    for (var i=0; i<radio.length; i++) {
-		    if (radio[i].checked) {
-			    this.state.isPrivate=radio[i].value;
-		    }
-	    }
+      if(radio != null){
+        for (var i=0; i<radio.length; i++) {
+          if (radio[i].checked) {
+            this.state.isPrivate=radio[i].value;
+          }
+        }
+      }else{
+        this.state.isPrivate = true;
+      }
       const submintApi = this.type == '1' ? modifyModel : saveLocalModel;
       submintApi({
         repo: location.pathname.split('/').slice(0, 3).join('/'),

From b0ced7d351064604592b582bcd91a34cf2692ee1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 15:28:41 +0800
Subject: [PATCH 28/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/create_online.tmpl                 | 4 ++++
 .../pages/modelmanage/local/modelmanage-local-create-1.vue    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/repo/modelmanage/create_online.tmpl b/templates/repo/modelmanage/create_online.tmpl
index 78e51450c..a0baa187b 100644
--- a/templates/repo/modelmanage/create_online.tmpl
+++ b/templates/repo/modelmanage/create_online.tmpl
@@ -568,6 +568,10 @@
             let cName = $("input[name='name']").val();
             let version = $("input[name='version']").val();
             let data = $("#formId").serialize();
+            var radio = document.getElementsByName("isPrivate");
+            if(radio == null || radio.length == 0){
+                data +="&isPrivate=true";
+            }
             const initModel = $("input[name='initModel']").val();
             let url_href = location.href.split("create_online_model")[0] + 'create_new_model';
             $("#mask").css({ display: "block", "z-index": "9999" });
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 67d0e6349..57ca07779 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -181,7 +181,7 @@ export default {
         return;
       }
       var radio = document.getElementsByName("isPrivate");
-      if(radio != null){
+      if(radio != null && radio.length > 0){
         for (var i=0; i<radio.length; i++) {
           if (radio[i].checked) {
             this.state.isPrivate=radio[i].value;

From d2dcdc00dadb42d02e2cb6a504d3a1615522be70 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 15:40:18 +0800
Subject: [PATCH 29/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/cloudbrain/trainjob/show.tmpl | 4 ++++
 templates/repo/grampus/trainjob/show.tmpl    | 4 ++++
 templates/repo/modelarts/trainjob/show.tmpl  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index b3f796c67..46534e4de 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -866,6 +866,10 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
+        var radio = document.getElementsByName("isPrivate");
+        if(radio == null || radio.length == 0){
+            data +="&isPrivate=true";
+        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index d07c870e2..089ef2386 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -927,6 +927,10 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
+        var radio = document.getElementsByName("isPrivate");
+        if(radio == null || radio.length == 0){
+            data +="&isPrivate=true";
+        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index fd1959cd6..08559fcf1 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -949,6 +949,10 @@
         }
         let url_href = `/${userName}/${repoPath}/modelmanage/create_new_model`
         let data = $("#formId").serialize()
+        var radio = document.getElementsByName("isPrivate");
+        if(radio == null || radio.length == 0){
+            data +="&isPrivate=true";
+        }
         $("#mask").css({ "display": "block", "z-index": "9999" })
         $.ajax({
             url: url_href,

From 5c67b586d1d5aa09dc63f5e5421d4a51d64608f8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 16:00:07 +0800
Subject: [PATCH 30/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 templates/repo/modelmanage/index.tmpl         |  3 ++-
 web_src/js/components/Model.vue               | 22 ++++++-------------
 .../local/modelmanage-local-create-1.vue      |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/templates/repo/modelmanage/index.tmpl b/templates/repo/modelmanage/index.tmpl
index ebc4b5ca1..c3b79d0b7 100644
--- a/templates/repo/modelmanage/index.tmpl
+++ b/templates/repo/modelmanage/index.tmpl
@@ -44,7 +44,7 @@
     }
 </style>
 <link rel="stylesheet" href="/self/ztree/css/zTreeStyle/zTreeStyle.css" type="text/css">
-
+<script>var REPO_IS_PRIVATE = {{.Repository.IsPrivate}};</script>
 
 <!-- 弹窗 -->
 <div id="mask">
@@ -57,6 +57,7 @@
     </div>
 </div>
 {{$repository := .Repository.ID}}
+
 <!-- 提示框 -->
 <div class="alert"></div>
 
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 02b8643ae..935cd9f1e 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -137,26 +137,17 @@
           >
             <template slot-scope="scope">
               <div class="space-around" >
-                <!--<a
-                  :style="{
-                    visibility: !scope.row.Children ? 'visible' : 'hidden',
-                  }"
-                  :class="{ disabled: !scope.row.isCanOper }"
-                  @click="
-                    showcreateVue(
-                      scope.row.name,
-                      scope.row.version,
-                      scope.row.label
-                    )
-                  "
-                  >{{ i18n.model_create_new_ver }}</a
-                >-->
+               
                 <a class="op-btn"
                   v-show="scope.row.modelType == 1"
                   :href="url + 'create_local_model_1?type=1&name=' + encodeURIComponent(scope.row.name) + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
+                
+                <a class="op-btn" v-show="scope.repoIsPrivate == false && scope.row.isPrivate==true" style="color:transparent;cursor:default;" >设为公开</a>
+                <a class="op-btn" v-show="scope.repoIsPrivate == false && scope.row.isPrivate==false" style="color:transparent;cursor:default;" >设为私有</a>
+                
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
@@ -191,7 +182,7 @@
 
 <script>
 const { _AppSubUrl, _StaticUrlPrefix, csrf } = window.config;
-
+const REPOISPRIVATE = window.REPO_IS_PRIVATE;
 export default {
   components: {},
   data() {
@@ -211,6 +202,7 @@ export default {
       data: "",
       timer: null,
       timerFlag: false,
+      repoIsPrivate:  REPOISPRIVATE,
     };
   },
   methods: {
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 57ca07779..32c64d4c7 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -157,7 +157,7 @@ export default {
       nameErr: false,
       isShowVersion: false,
       engineList: MODEL_ENGINES,
-      repoIsPrivate:  REPOISPRIVATE
+      repoIsPrivate:  REPOISPRIVATE,
     };
   },
   components: {},

From d1862db8d79ebc6c951f06d41da184caa8602cf1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 16:00:52 +0800
Subject: [PATCH 31/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 935cd9f1e..e4d624a27 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -145,8 +145,8 @@
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
                 
-                <a class="op-btn" v-show="scope.repoIsPrivate == false && scope.row.isPrivate==true" style="color:transparent;cursor:default;" >设为公开</a>
-                <a class="op-btn" v-show="scope.repoIsPrivate == false && scope.row.isPrivate==false" style="color:transparent;cursor:default;" >设为私有</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true" style="color:transparent;cursor:default;" >设为公开</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false" style="color:transparent;cursor:default;" >设为私有</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"

From ef507f9100e364b526b5a17d31cf0d6f19e3e0f0 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 16:10:19 +0800
Subject: [PATCH 32/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 20 ++++++++++++++++----
 web_src/js/features/i18nVue.js  |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index e4d624a27..d9ad3d44a 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -130,6 +130,19 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="isPrivate"
+            :label="i18n.model_access"
+            align="center"
+            min-width="6.75%"
+          >
+            <template slot-scope="scope">
+             <span class="text-over" :title="scope.row.isPrivate">{{
+                scope.row.isPrivate
+              }}</span>
+            </template>
+          </el-table-column>
+
           <el-table-column
             :label="i18n.model_operation"
             min-width="15%"
@@ -143,10 +156,9 @@
                   :href="url + 'create_local_model_1?type=1&name=' + encodeURIComponent(scope.row.name) + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
-                <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
-                
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true" style="color:transparent;cursor:default;" >设为公开</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false" style="color:transparent;cursor:default;" >设为私有</a>
+                              
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true">设为公开</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false">设为私有</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js
index 5e8c55e62..1f6dec869 100644
--- a/web_src/js/features/i18nVue.js
+++ b/web_src/js/features/i18nVue.js
@@ -92,6 +92,7 @@ export const i18nVue = {
     model_create_time: "创建时间",
     model_creator: "创建者",
     model_operation: "操作",
+    model_access: "权限",
     model_create_new_ver: "创建新版本",
     model_download: "下载",
     model_delete: "删除",
@@ -208,6 +209,7 @@ export const i18nVue = {
     model_create_time: "Created Time",
     model_creator: "Creator",
     model_operation: "Operation",
+    model_access: "Access",
     model_create_new_ver: "New Version",
     model_download: "Download",
     model_delete: "Delete",

From 4f6f6db6d8fa80a56ecd3e237ac61eb99e0c4217 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 16:14:20 +0800
Subject: [PATCH 33/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index d9ad3d44a..c3d75bf75 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -156,7 +156,7 @@
                   :href="url + 'create_local_model_1?type=1&name=' + encodeURIComponent(scope.row.name) + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
-                              
+                <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
                 <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true">设为公开</a>
                 <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false">设为私有</a>
                 

From caf9e9bb896e6d870519b7f75e4452d656083360 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 2 Dec 2022 16:30:50 +0800
Subject: [PATCH 34/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 38 ++++++++++++++++++++-------------
 web_src/js/features/i18nVue.js  |  8 +++++++
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index c3d75bf75..ae38f86c0 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -101,6 +101,19 @@
               <span class="text-over">{{ scope.row.computeResource }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="isPrivate"
+            :label="i18n.model_access"
+            align="center"
+            min-width="6.75%"
+          >
+            <template slot-scope="scope">
+             <span class="text-over" :title="scope.row.isPrivate">
+                {{transStatus(scope.row.isPrivate)}}
+             </span>
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="createdUnix"
             :label="i18n.model_create_time"
@@ -130,19 +143,6 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="isPrivate"
-            :label="i18n.model_access"
-            align="center"
-            min-width="6.75%"
-          >
-            <template slot-scope="scope">
-             <span class="text-over" :title="scope.row.isPrivate">{{
-                scope.row.isPrivate
-              }}</span>
-            </template>
-          </el-table-column>
-
           <el-table-column
             :label="i18n.model_operation"
             min-width="15%"
@@ -157,8 +157,8 @@
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true">设为公开</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false">设为私有</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true">>{{ i18n.modelaccess_setpublic }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false">>{{ i18n.modelaccess_setprivate }}</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
@@ -546,6 +546,14 @@ export default {
     showinfoHref() {
       return this.url + "show_model_info?name=";
     },
+    transStatus(){
+      return function (state) {
+          if(state){
+             return this.i18n.modelaccess_private;
+          }
+          return this.i18n.modelaccess_public;
+      }
+    },
     transTime() {
       return function (time) {
         let date = new Date(time * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
diff --git a/web_src/js/features/i18nVue.js b/web_src/js/features/i18nVue.js
index 1f6dec869..059990269 100644
--- a/web_src/js/features/i18nVue.js
+++ b/web_src/js/features/i18nVue.js
@@ -93,6 +93,10 @@ export const i18nVue = {
     model_creator: "创建者",
     model_operation: "操作",
     model_access: "权限",
+    modelaccess_public:"公开",
+    modelaccess_private:"私有",
+    modelaccess_setpublic:"设为公开",
+    modelaccess_setprivate:"设为私有",
     model_create_new_ver: "创建新版本",
     model_download: "下载",
     model_delete: "删除",
@@ -210,6 +214,10 @@ export const i18nVue = {
     model_creator: "Creator",
     model_operation: "Operation",
     model_access: "Access",
+    modelaccess_public:"Public",
+    modelaccess_private:"Private",
+    modelaccess_setpublic:"Set Public",
+    modelaccess_setprivate:"Set Private",
     model_create_new_ver: "New Version",
     model_download: "Download",
     model_delete: "Delete",

From 12336844b476189709fb77427b429ab064212dc1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 09:32:37 +0800
Subject: [PATCH 35/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go                     |  3 +-
 routers/repo/ai_model_convert.go              |  4 +--
 routers/repo/ai_model_manage.go               | 33 ++++++++++++++-----
 web_src/js/components/Model.vue               |  6 ++--
 .../common/modelmanage-common-detail.vue      |  6 ++--
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 3083c4266..8f83a6c68 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -33,7 +33,7 @@ type AiModelManage struct {
 	CodeBranch        string             `xorm:"varchar(400) NULL" json:"codeBranch"`
 	CodeCommitID      string             `xorm:"NULL" json:"codeCommitID"`
 	UserId            int64              `xorm:"NOT NULL" json:"userId"`
-	IsPrivate         bool               `xorm:"DEFAULT false" json:"isPrivate"`
+	IsPrivate         bool               `xorm:"DEFAULT true" json:"isPrivate"`
 	UserName          string             `json:"userName"`
 	UserRelAvatarLink string             `json:"userRelAvatarLink"`
 	TrainTaskInfo     string             `xorm:"text NULL" json:"trainTaskInfo"`
@@ -41,6 +41,7 @@ type AiModelManage struct {
 	UpdatedUnix       timeutil.TimeStamp `xorm:"updated" json:"updatedUnix"`
 	IsCanOper         bool               `json:"isCanOper"`
 	IsCanDelete       bool               `json:"isCanDelete"`
+	IsCanDownload     bool               `json:"isCanDownload"`
 }
 
 type AiModelConvert struct {
diff --git a/routers/repo/ai_model_convert.go b/routers/repo/ai_model_convert.go
index 4ba414bff..dda410def 100644
--- a/routers/repo/ai_model_convert.go
+++ b/routers/repo/ai_model_convert.go
@@ -620,7 +620,7 @@ func ShowModelConvertInfo(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Name"] = job.Name
-	ctx.Data["canDownload"] = isOper(ctx, job.UserId)
+	ctx.Data["canDownload"] = isOperModifyOrDelete(ctx, job.UserId)
 	user, err := models.GetUserByID(job.UserId)
 	if err == nil {
 		job.UserName = user.Name
@@ -755,7 +755,7 @@ func GetModelConvertPageData(ctx *context.Context) ([]*models.AiModelConvert, in
 	}
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
-		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index d93905d7c..72ca6d359 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -581,7 +581,7 @@ func DownloadMultiModelFile(ctx *context.Context) {
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	if !isOper(ctx, task.UserId) {
+	if !isCanDownload(ctx, task) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
@@ -809,7 +809,7 @@ func DownloadSingleModelFile(ctx *context.Context) {
 		ctx.ServerError("no such model:", err)
 		return
 	}
-	if !isOper(ctx, task.UserId) {
+	if !isCanDownload(ctx, task) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
@@ -877,8 +877,9 @@ func QueryModelById(ctx *context.Context) {
 	id := ctx.Query("id")
 	model, err := models.QueryModelById(id)
 	if err == nil {
-		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
+		model.IsCanDownload = isCanDownload(ctx, model)
 		removeIpInfo(model)
 		ctx.JSON(http.StatusOK, model)
 	} else {
@@ -894,7 +895,8 @@ func ShowSingleModel(ctx *context.Context) {
 
 	userIds := make([]int64, len(models))
 	for i, model := range models {
-		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
+		model.IsCanDownload = isCanDownload(ctx, model)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
@@ -944,7 +946,8 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 
 	userIds := make([]int64, len(aimodels))
 	for i, model := range aimodels {
-		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
+		model.IsCanDownload = isCanDownload(ctx, model)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
 		userIds[i] = model.UserId
 	}
@@ -1004,6 +1007,19 @@ func isQueryRight(ctx *context.Context) bool {
 	}
 }
 
+func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
+	if ctx.User == nil {
+		return false
+	}
+	if ctx.User.IsAdmin || ctx.User.ID == task.UserId {
+		return true
+	}
+	if !task.IsPrivate {
+		return true
+	}
+	return false
+}
+
 func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
@@ -1017,7 +1033,7 @@ func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	return false
 }
 
-func isOper(ctx *context.Context, modelUserId int64) bool {
+func isOperModifyOrDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
 	}
@@ -1060,8 +1076,9 @@ func ShowModelPageInfo(ctx *context.Context) {
 
 	userIds := make([]int64, len(modelResult))
 	for i, model := range modelResult {
-		model.IsCanOper = isOper(ctx, model.UserId)
+		model.IsCanOper = isOperModifyOrDelete(ctx, model.UserId)
 		model.IsCanDelete = isCanDelete(ctx, model.UserId)
+		model.IsCanDownload = isCanDownload(ctx, model)
 		userIds[i] = model.UserId
 	}
 
@@ -1105,7 +1122,7 @@ func ModifyModelInfo(ctx *context.Context) {
 		ctx.JSON(200, re)
 		return
 	}
-	if !isOper(ctx, task.UserId) {
+	if !isOperModifyOrDelete(ctx, task.UserId) {
 		re["msg"] = "No right to operation."
 		ctx.JSON(200, re)
 		return
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index ae38f86c0..505342f05 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -157,12 +157,12 @@
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true">>{{ i18n.modelaccess_setpublic }}</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false">>{{ i18n.modelaccess_setprivate }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper">>{{ i18n.modelaccess_setpublic }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper">>{{ i18n.modelaccess_setprivate }}</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
-                  :class="{ disabled: !scope.row.isCanOper }"
+                  :class="{ disabled: !scope.row.isCanDownload }"
                   >{{ i18n.model_download }}</a>
                 <a class="op-btn"
                   :class="{ disabled: !scope.row.isCanDelete }"
diff --git a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
index f87421bc1..d84750a6b 100644
--- a/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
+++ b/web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue
@@ -182,8 +182,8 @@
                       <span>{{ scope.row.FileName }}</span>
                     </div>
                   </a>
-                  <a v-else :class="!canOperate ? 'disabled-download' : ''"
-                    :href="canOperate ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath.length > 1 ? encodeURIComponent(filePath.map(item => item.path).join('/').slice(1) + '/') : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
+                  <a v-else :class="!canDownload ? 'disabled-download' : ''"
+                    :href="canDownload ? `${repo}/modelmanage/${state.id}/downloadsingle?parentDir=${filePath.length > 1 ? encodeURIComponent(filePath.map(item => item.path).join('/').slice(1) + '/') : ''}&fileName=${scope.row.FileName}` : 'javascript:;'">
                     <div class="fitted" :title="scope.row.FileName">
                       <i class="icon file" width="16" height="16" aria-hidden="true"></i>
                       <span>{{ scope.row.FileName }}</span>
@@ -228,6 +228,7 @@ export default {
     return {
       modelType: '0', // 1-本地, 0-线上
       canOperate: false,
+      canDownload:false,
       canDelete: false,
       isExpanded: false,
       loading: false,
@@ -291,6 +292,7 @@ export default {
       const data = this.modelList.filter((model) => model.version == version)[0];
       this.modelType = data.modelType;
       this.canOperate = data.isCanOper;
+      this.canDownload = data.isCanDownload;
       this.canDelete = data.isCanDelete;
       this.state.type = data.type;
       this.state.typeStr = data.type == 0 ? 'CPU/GPU' : data.type == 1 ? 'NPU' : '';

From de0402e2e41a2613b6c70a5329c587b3406ed746 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 10:13:47 +0800
Subject: [PATCH 36/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_invitation.go       |  1 +
 routers/repo/user_invitation.go |  9 ++++++---
 routers/user/Invitation.go      |  3 ++-
 routers/user/auth.go            |  2 +-
 web_src/js/components/Model.vue | 22 +++++++---------------
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/models/user_invitation.go b/models/user_invitation.go
index 2d37bcb23..8a10e71a0 100644
--- a/models/user_invitation.go
+++ b/models/user_invitation.go
@@ -13,6 +13,7 @@ type Invitation struct {
 	SrcUserID         int64              `xorm:"NOT NULL DEFAULT 0"`
 	UserID            int64              `xorm:"NOT NULL DEFAULT 0"`
 	Phone             string             `xorm:"INDEX"`
+	Email             string             `xorm:"-"`
 	Avatar            string             `xorm:"-"`
 	Name              string             `xorm:"-"`
 	InvitationUserNum int                `xorm:"-"`
diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index a2752a481..6e7207bce 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -49,9 +49,10 @@ func getInvitationDetailExcelHeader(ctx *context.Context) map[string]string {
 	excelHeader := make([]string, 0)
 	excelHeader = append(excelHeader, ctx.Tr("user.static.id"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.name"))
-	excelHeader = append(excelHeader, ctx.Tr("user.static.srcUserId"))
+	excelHeader = append(excelHeader, ctx.Tr("user.static.email"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.phone"))
 	excelHeader = append(excelHeader, ctx.Tr("user.static.registdate"))
+	excelHeader = append(excelHeader, ctx.Tr("user.static.srcUserId"))
 
 	excelHeaderMap := make(map[string]string, 0)
 	var i byte
@@ -92,8 +93,7 @@ func writeInvitationDetailExcel(row int, xlsx *excelize.File, sheetName string,
 	tmp = tmp + 1
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Name)
 	tmp = tmp + 1
-
-	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Email)
 	tmp = tmp + 1
 
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.Phone)
@@ -101,7 +101,9 @@ func writeInvitationDetailExcel(row int, xlsx *excelize.File, sheetName string,
 
 	formatTime := userRecord.CreatedUnix.Format("2006-01-02 15:04:05")
 	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
+	tmp = tmp + 1
 
+	xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
 }
 
 func DownloadInvitationDetail(ctx *context.Context) {
@@ -413,6 +415,7 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					invi.Name = tmpUser.Name
 					invi.Phone = tmpUser.PhoneNumber
 					invi.CreatedUnix = tmpUser.CreatedUnix
+					invi.Email = tmpUser.Email
 				} else {
 					invi.Name = "已注销"
 				}
diff --git a/routers/user/Invitation.go b/routers/user/Invitation.go
index 8491390b2..0eb8ae2f4 100644
--- a/routers/user/Invitation.go
+++ b/routers/user/Invitation.go
@@ -63,7 +63,7 @@ func InviationTpl(ctx *context.Context) {
 	ctx.HTML(200, tplInvitation)
 }
 
-func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhoneNumber string) error {
+func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhoneNumber string, email string) error {
 	user := parseInvitaionCode(invitationcode)
 	if user == nil {
 		return errors.New("The invitated user not existed.")
@@ -85,6 +85,7 @@ func RegisteUserByInvitaionCode(invitationcode string, newUserId int64, newPhone
 		SrcUserID: user.ID,
 		UserID:    newUserId,
 		Phone:     newPhoneNumber,
+		Email:     email,
 	}
 
 	err := models.InsertInvitaion(invitation)
diff --git a/routers/user/auth.go b/routers/user/auth.go
index 3d74b6ddd..5314571d2 100755
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -1368,7 +1368,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo
 
 	log.Info("enter here, and form.InvitaionCode =" + invitationCode)
 	if invitationCode != "" {
-		RegisteUserByInvitaionCode(invitationCode, u.ID, u.PhoneNumber)
+		RegisteUserByInvitaionCode(invitationCode, u.ID, u.PhoneNumber, u.Email)
 	}
 
 	err := models.AddEmailAddress(&models.EmailAddress{
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 505342f05..db87dc2ca 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -32,18 +32,7 @@
               >
             </template>
           </el-table-column>
-          <el-table-column
-            prop="status"
-            :label="i18n.model_status"
-            align="center"
-            min-width="6.5%"
-          >
-            <template slot-scope="scope">
-              <span class="text-over" :title="scope.row.status_title">
-                <i style="vertical-align: middle" :class="scope.row.status"></i
-              ></span>
-            </template>
-          </el-table-column>
+          
           <el-table-column
             prop="version"
             :label="i18n.model_version"
@@ -103,11 +92,14 @@
           </el-table-column>
           <el-table-column
             prop="isPrivate"
-            :label="i18n.model_access"
+            :label="i18n.model_status"
             align="center"
             min-width="6.75%"
           >
             <template slot-scope="scope">
+             <span class="text-over" :title="scope.row.status_title">
+                <i style="vertical-align: middle" :class="scope.row.status"></i
+              ></span>
              <span class="text-over" :title="scope.row.isPrivate">
                 {{transStatus(scope.row.isPrivate)}}
              </span>
@@ -157,8 +149,8 @@
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper">>{{ i18n.modelaccess_setpublic }}</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper">>{{ i18n.modelaccess_setprivate }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper">{{ i18n.modelaccess_setpublic }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper">{{ i18n.modelaccess_setprivate }}</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"

From 25aba8919b9301d2cd1bda03ff51443184252a71 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 10:43:24 +0800
Subject: [PATCH 37/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 14 ++++++++++++++
 routers/repo/ai_model_manage.go | 26 ++++++++++++++++++++++++++
 routers/routes/routes.go        |  1 +
 web_src/js/components/Model.vue | 22 ++++++++++++++++++++--
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 8f83a6c68..4e535003e 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -290,6 +290,20 @@ func ModifyModelDescription(id string, description string) error {
 	return nil
 }
 
+func ModifyModelPrivate(id string, isPrivate bool) error {
+	var sess *xorm.Session
+	sess = x.ID(id)
+	defer sess.Close()
+	re, err := sess.Cols("is_private").Update(&AiModelManage{
+		IsPrivate: isPrivate,
+	})
+	if err != nil {
+		return err
+	}
+	log.Info("success to update isPrivate from  db.re=" + fmt.Sprint((re)))
+	return nil
+}
+
 func ModifyLocalModel(id string, name, label, description string, engine int) error {
 	var sess *xorm.Session
 	sess = x.ID(id)
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 72ca6d359..80fe34ee2 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1109,6 +1109,32 @@ func ModifyModel(id string, description string) error {
 	return err
 }
 
+func ModifyModelPrivate(ctx *context.Context) {
+	id := ctx.Query("id")
+	isPrivate := ctx.QueryBool("isPrivate")
+	re := map[string]string{
+		"code": "-1",
+	}
+	task, err := models.QueryModelById(id)
+	if err != nil || task == nil {
+		re["msg"] = err.Error()
+		log.Error("no such model!", err.Error())
+		ctx.JSON(200, re)
+		return
+	}
+	if !isOperModifyOrDelete(ctx, task.UserId) {
+		re["msg"] = "No right to operation."
+		ctx.JSON(200, re)
+		return
+	}
+	err = models.ModifyModelPrivate(id, isPrivate)
+	if err == nil {
+		log.Info("modify success.")
+	} else {
+		log.Info("Failed to modify.id=" + id + "  isprivate=" + fmt.Sprint(isPrivate) + " error:" + err.Error())
+	}
+}
+
 func ModifyModelInfo(ctx *context.Context) {
 	log.Info("modify model start.")
 	id := ctx.Query("id")
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 60f0365ea..80ff96364 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -1251,6 +1251,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Post("/delete_model_convert/:id", repo.DeleteModelConvert)
 			m.Post("/convert_stop/:id", repo.StopModelConvert)
 			m.Put("/modify_model", repo.ModifyModelInfo)
+			m.Put("/modify_model_status", repo.ModifyModelPrivate)
 			m.Get("/show_model", reqRepoModelManageReader, repo.ShowModelTemplate)
 			m.Get("/convert_model", reqRepoModelManageReader, repo.ConvertModelTemplate)
 			m.Get("/show_model_info", repo.ShowModelInfo)
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index db87dc2ca..68be0bab7 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -149,8 +149,12 @@
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper">{{ i18n.modelaccess_setpublic }}</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper">{{ i18n.modelaccess_setprivate }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper"  @click="
+                    modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,false)
+                  ">{{ i18n.modelaccess_setpublic }}</a>
+                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper"  @click="
+                    modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,true)
+                  ">{{ i18n.modelaccess_setprivate }}</a>
                 
                 <a class="op-btn"
                   :href="loadhref + scope.row.id"
@@ -399,6 +403,20 @@ export default {
         }
       }
     },
+    modifyModelStatus(id, name, rowKey,isPrivate) {
+      let row = { cName: name, id: id, rowKey: rowKey };
+      let _this = this;
+     _this.$axios
+      .put(_this.url + "modify_model_status", {
+                params: {
+                  id: id,
+                  isPrivate:isPrivate,
+                },
+      })
+      .then((res) => {
+                _this.loadrefresh(row);
+      });
+    },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };
       let _this = this;

From d5d98af7adb5ab932e6ef356258951ec94922c15 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 10:51:21 +0800
Subject: [PATCH 38/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 68be0bab7..f055963a0 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -408,10 +408,8 @@ export default {
       let _this = this;
      _this.$axios
       .put(_this.url + "modify_model_status", {
-                params: {
                   id: id,
                   isPrivate:isPrivate,
-                },
       })
       .then((res) => {
                 _this.loadrefresh(row);

From 246de4f6fb11fbde5468c850d3f61ab64813ea06 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:02:08 +0800
Subject: [PATCH 39/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue              | 13 ++++---------
 web_src/vuepages/apis/modules/modelmanage.js | 10 ++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index f055963a0..1be70db46 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -189,6 +189,7 @@
 </template>
 
 <script>
+import { modifyModelStatus } from '~/apis/modules/modelmanage';
 const { _AppSubUrl, _StaticUrlPrefix, csrf } = window.config;
 const REPOISPRIVATE = window.REPO_IS_PRIVATE;
 export default {
@@ -405,15 +406,9 @@ export default {
     },
     modifyModelStatus(id, name, rowKey,isPrivate) {
       let row = { cName: name, id: id, rowKey: rowKey };
-      let _this = this;
-     _this.$axios
-      .put(_this.url + "modify_model_status", {
-                  id: id,
-                  isPrivate:isPrivate,
-      })
-      .then((res) => {
-                _this.loadrefresh(row);
-      });
+      data = {'id':id,'isPrivate':isPrivate};
+      modifyModelStatus(data);
+      _this.loadrefresh(row);
     },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };
diff --git a/web_src/vuepages/apis/modules/modelmanage.js b/web_src/vuepages/apis/modules/modelmanage.js
index 7124dcfc9..a9423a0de 100644
--- a/web_src/vuepages/apis/modules/modelmanage.js
+++ b/web_src/vuepages/apis/modules/modelmanage.js
@@ -24,6 +24,16 @@ export const modifyModel = (data) => {
   });
 };
 
+export const modifyModelStatus = (data) => {
+  return service({
+    url: `${data.repo}/modelmanage/modify_model_status`,
+    method: 'put',
+    headers: { 'Content-type': 'application/x-www-form-urlencoded' },
+    params: {},
+    data: Qs.stringify(data),
+  });
+};
+
 // 求模型信息
 export const getModelInfoByName = (params) => {
   return service({

From e8baee2ab10387d10d7858dc9436ca202ec6cb09 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:05:08 +0800
Subject: [PATCH 40/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 1be70db46..40933823e 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -406,7 +406,7 @@ export default {
     },
     modifyModelStatus(id, name, rowKey,isPrivate) {
       let row = { cName: name, id: id, rowKey: rowKey };
-      data = {'id':id,'isPrivate':isPrivate};
+      let data = {'id':id,'isPrivate':isPrivate};
       modifyModelStatus(data);
       _this.loadrefresh(row);
     },

From 8148aee6ef1b2ce005e383ea134996e495e3f6dd Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:12:05 +0800
Subject: [PATCH 41/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 40933823e..6ab927b1d 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -206,6 +206,7 @@ export default {
       isLoading: true,
       loadNodeMap: new Map(),
       submitId: {},
+      repo: location.pathname.split('/').slice(0, 3).join('/'),
       defaultAvatar: "/user/avatar/Ghost/-1",
       defaultAvatarName: "Ghost",
       data: "",
@@ -406,7 +407,7 @@ export default {
     },
     modifyModelStatus(id, name, rowKey,isPrivate) {
       let row = { cName: name, id: id, rowKey: rowKey };
-      let data = {'id':id,'isPrivate':isPrivate};
+      let data = {'id':id,'isPrivate':isPrivate,'repo':this.repo};
       modifyModelStatus(data);
       _this.loadrefresh(row);
     },

From 4fd7568cc7c90392af694632c4187462d6277491 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:16:53 +0800
Subject: [PATCH 42/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 6ab927b1d..c291c5ffa 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -406,10 +406,9 @@ export default {
       }
     },
     modifyModelStatus(id, name, rowKey,isPrivate) {
-      let row = { cName: name, id: id, rowKey: rowKey };
       let data = {'id':id,'isPrivate':isPrivate,'repo':this.repo};
       modifyModelStatus(data);
-      _this.loadrefresh(row);
+      this.getModelList();
     },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };

From 5c13e2354a25587ed42476746811d1cc6abc8612 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:25:44 +0800
Subject: [PATCH 43/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go |  5 +++++
 web_src/js/components/Model.vue | 21 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 80fe34ee2..55451be16 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1129,10 +1129,15 @@ func ModifyModelPrivate(ctx *context.Context) {
 	}
 	err = models.ModifyModelPrivate(id, isPrivate)
 	if err == nil {
+		re["code"] = "0"
+		ctx.JSON(200, re)
 		log.Info("modify success.")
 	} else {
+		re["msg"] = err.Error()
+		ctx.JSON(200, re)
 		log.Info("Failed to modify.id=" + id + "  isprivate=" + fmt.Sprint(isPrivate) + " error:" + err.Error())
 	}
+
 }
 
 func ModifyModelInfo(ctx *context.Context) {
diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index c291c5ffa..b4c61db0f 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -407,8 +407,25 @@ export default {
     },
     modifyModelStatus(id, name, rowKey,isPrivate) {
       let data = {'id':id,'isPrivate':isPrivate,'repo':this.repo};
-      modifyModelStatus(data);
-      this.getModelList();
+      modifyModelStatus(data).then(res => {
+        res = res.data;
+        if (res && res.code == '0') {
+          this.getModelList();
+        } else {
+          this.$message({
+            type: 'error',
+            message: this.$t('modelManage.infoModificationFailed'),
+          });
+        }
+      }).catch(err => {
+        console.log(err);
+        this.$message({
+          type: 'error',
+          message: this.$t('modelManage.infoModificationFailed'),
+        });
+      });
+    },
+      
     },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };

From 5c8050f16aa259c41bc22374f175d4d81c10a0a1 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 11:33:26 +0800
Subject: [PATCH 44/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index b4c61db0f..fa1515f3c 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -425,8 +425,6 @@ export default {
         });
       });
     },
-      
-    },
     deleteModel(id, name, rowKey) {
       let row = { cName: name, id: id, rowKey: rowKey };
       let _this = this;

From 42acb4ce086390aa84e9ce63ac6b5835928ab6fe Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 15:18:51 +0800
Subject: [PATCH 45/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       |  4 ++++
 routers/repo/ai_model_manage.go | 14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 4e535003e..2c38bd130 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -427,6 +427,10 @@ func QueryModel(opts *AiModelQueryOptions) ([]*AiModelManage, int64, error) {
 			builder.Eq{"ai_model_manage.status": opts.Status},
 		)
 	}
+	orCon := builder.NewCond()
+	orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false})
+
+	cond = cond.Or(orCon)
 
 	count, err := sess.Where(cond).Count(new(AiModelManage))
 	if err != nil {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 55451be16..0827b56a2 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -557,20 +557,6 @@ func deleteModelByID(ctx *context.Context, id string) error {
 	return err
 }
 
-func QueryModelByParameters(repoId int64, page int) ([]*models.AiModelManage, int64, error) {
-
-	return models.QueryModel(&models.AiModelQueryOptions{
-		ListOptions: models.ListOptions{
-			Page:     page,
-			PageSize: setting.UI.IssuePagingNum,
-		},
-		RepoID: repoId,
-		Type:   -1,
-		New:    MODEL_LATEST,
-		Status: -1,
-	})
-}
-
 func DownloadMultiModelFile(ctx *context.Context) {
 	log.Info("DownloadMultiModelFile start.")
 	id := ctx.Query("id")

From 27bea7079fcc8ded139222a9d142ec827bda9f06 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 16:38:29 +0800
Subject: [PATCH 46/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 0827b56a2..6c2aaf0df 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1205,7 +1205,8 @@ func QueryModelListForPredict(ctx *context.Context) {
 
 	nameMap := make(map[string][]*models.AiModelManage)
 	for _, model := range modelResult {
-		removeIpInfo(model)
+		model.TrainTaskInfo = ""
+		//removeIpInfo(model)
 		if _, value := nameMap[model.Name]; !value {
 			models := make([]*models.AiModelManage, 0)
 			models = append(models, model)

From f3e5ecf4549c8817eef9621785994d52f3c1121c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 16:44:33 +0800
Subject: [PATCH 47/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 6c2aaf0df..68e74f74c 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1206,6 +1206,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 	nameMap := make(map[string][]*models.AiModelManage)
 	for _, model := range modelResult {
 		model.TrainTaskInfo = ""
+		model.Accuracy = ""
 		//removeIpInfo(model)
 		if _, value := nameMap[model.Name]; !value {
 			models := make([]*models.AiModelManage, 0)

From 34a226f5e6bf6ab897a590552326ed7813d0c477 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 16:46:21 +0800
Subject: [PATCH 48/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 68e74f74c..06f601517 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1185,10 +1185,18 @@ func ModifyModelInfo(ctx *context.Context) {
 
 func QueryModelListForPredict(ctx *context.Context) {
 	repoId := ctx.Repo.Repository.ID
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = -1
+	}
+	pageSize := ctx.QueryInt("pageSize")
+	if pageSize <= 0 {
+		pageSize = -1
+	}
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
 		ListOptions: models.ListOptions{
-			Page:     -1,
-			PageSize: -1,
+			Page:     page,
+			PageSize: pageSize,
 		},
 		RepoID: repoId,
 		Type:   ctx.QueryInt("type"),

From b4cc2cba5edb37786ead8e4f281ba72b8104d501 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 5 Dec 2022 17:45:42 +0800
Subject: [PATCH 49/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go                    | 15 ++++++++-------
 routers/repo/ai_model_manage.go              | 10 ++++++----
 templates/repo/modelmanage/convertIndex.tmpl |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 2c38bd130..6f791010f 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -86,8 +86,9 @@ type AiModelQueryOptions struct {
 	SortType string
 	New      int
 	// JobStatus     CloudbrainStatus
-	Type   int
-	Status int
+	Type           int
+	Status         int
+	IsOnlyThisRepo bool
 }
 
 func (a *AiModelConvert) IsGpuTrainTask() bool {
@@ -427,11 +428,11 @@ func QueryModel(opts *AiModelQueryOptions) ([]*AiModelManage, int64, error) {
 			builder.Eq{"ai_model_manage.status": opts.Status},
 		)
 	}
-	orCon := builder.NewCond()
-	orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false})
-
-	cond = cond.Or(orCon)
-
+	if !opts.IsOnlyThisRepo {
+		orCon := builder.NewCond()
+		orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false})
+		cond = cond.Or(orCon)
+	}
 	count, err := sess.Where(cond).Count(new(AiModelManage))
 	if err != nil {
 		return nil, 0, fmt.Errorf("Count: %v", err)
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 06f601517..c03fa8703 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1193,15 +1193,17 @@ func QueryModelListForPredict(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = -1
 	}
+	IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo")
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
 			PageSize: pageSize,
 		},
-		RepoID: repoId,
-		Type:   ctx.QueryInt("type"),
-		New:    -1,
-		Status: 0,
+		RepoID:         repoId,
+		Type:           ctx.QueryInt("type"),
+		New:            -1,
+		Status:         0,
+		IsOnlyThisRepo: IsOnlyThisRepo,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)
diff --git a/templates/repo/modelmanage/convertIndex.tmpl b/templates/repo/modelmanage/convertIndex.tmpl
index 725a29526..1b435fce9 100644
--- a/templates/repo/modelmanage/convertIndex.tmpl
+++ b/templates/repo/modelmanage/convertIndex.tmpl
@@ -487,7 +487,7 @@
     }
    
     function loadModelList(){
-        $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1`, (data) => {
+        $.get(`${repolink}/modelmanage/query_model_for_predict?repoId=${repoId}&type=-1&isOnlyThisRepo=true`, (data) => {
             modelData = data
             let nameList =  data.nameList
             const n_length = nameList.length

From d5f8a6f81238e9fabb99cb6abfd0bdd761775772 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 6 Dec 2022 09:16:44 +0800
Subject: [PATCH 50/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/home.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/home.go b/routers/home.go
index 092b30fe3..c676f51ad 100755
--- a/routers/home.go
+++ b/routers/home.go
@@ -8,6 +8,7 @@ package routers
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -754,11 +755,13 @@ func GetRankUser(index string) ([]map[string]interface{}, error) {
 	}
 	resultOrg := make([]map[string]interface{}, 0)
 	for _, userRank := range result {
+		log.Info("userRank" + userRank)
 		tmpIndex := strings.Index(userRank, " ")
 		userName := userRank
 		score := 0
 		label := ""
 		if tmpIndex != -1 {
+			log.Info("len=" + fmt.Sprint(len(userRank)) + " index=" + fmt.Sprint(tmpIndex))
 			userName = userRank[0:tmpIndex]
 			left := userRank[tmpIndex+1:]
 			tmpIndex1 := strings.Index(left, " ")

From 223f3de996c3e9a71c730b86a24a3f6113b38454 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 6 Dec 2022 10:44:08 +0800
Subject: [PATCH 51/74] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_analysis_for_activity.go |  7 +++++--
 models/user_business_analysis.go     | 14 ++++++++++++--
 routers/home.go                      |  3 ---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go
index f52b127c6..8193da6be 100644
--- a/models/user_analysis_for_activity.go
+++ b/models/user_analysis_for_activity.go
@@ -453,8 +453,11 @@ func QueryUserLoginInfo(userIds []int64) []*UserLoginLog {
 func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
+	log.Info("userId=" + fmt.Sprint(userId))
 	var re *UserSummaryCurrentYear
-	statictisSess.ID(userId).Get(re)
-
+	_, err := statictisSess.Table(new(UserSummaryCurrentYear)).ID(userId).Get(re)
+	if err != nil {
+		log.Info("error:=" + err.Error())
+	}
 	return re
 }
diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 394c24825..0043c4344 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -610,7 +610,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 
 	DataDate := currentTimeNow.Format("2006-01-02") + " 00:01"
 	bonusMap := make(map[string]map[string]int)
-	if tableName == "user_business_analysis_current_year" {
+	if isUserYearData(tableName) {
 		bonusMap = getBonusMap()
 		log.Info("truncate all data from table:user_summary_current_year ")
 		statictisSess.Exec("TRUNCATE TABLE user_summary_current_year")
@@ -712,7 +712,7 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 					userMetrics["TotalHasActivityUser"] = getMapKeyStringValue("TotalHasActivityUser", userMetrics) + 1
 				}
 			}
-			if tableName == "user_business_analysis_current_year" {
+			if isUserYearData(tableName) {
 				//年度数据
 				subTime := time.Now().UTC().Sub(dateRecordAll.RegistDate.AsTime().UTC())
 				mostActiveDay := ""
@@ -772,6 +772,16 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	log.Info("refresh data finished.tableName=" + tableName + " total record:" + fmt.Sprint(insertCount))
 }
 
+func isUserYearData(tableName string) bool {
+	if tableName == "user_business_analysis_current_year" {
+		currentTimeNow := time.Now()
+		if currentTimeNow.Year() >= 2023 {
+			return false
+		}
+	}
+	return true
+}
+
 func getBonusMap() map[string]map[string]int {
 	bonusMap := make(map[string]map[string]int)
 	url := setting.RecommentRepoAddr + "bonus/record.txt"
diff --git a/routers/home.go b/routers/home.go
index c676f51ad..092b30fe3 100755
--- a/routers/home.go
+++ b/routers/home.go
@@ -8,7 +8,6 @@ package routers
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -755,13 +754,11 @@ func GetRankUser(index string) ([]map[string]interface{}, error) {
 	}
 	resultOrg := make([]map[string]interface{}, 0)
 	for _, userRank := range result {
-		log.Info("userRank" + userRank)
 		tmpIndex := strings.Index(userRank, " ")
 		userName := userRank
 		score := 0
 		label := ""
 		if tmpIndex != -1 {
-			log.Info("len=" + fmt.Sprint(len(userRank)) + " index=" + fmt.Sprint(tmpIndex))
 			userName = userRank[0:tmpIndex]
 			left := userRank[tmpIndex+1:]
 			tmpIndex1 := strings.Index(left, " ")

From 6522b068f4580c55f4b357cf6378f5563e7848ab Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 6 Dec 2022 10:58:33 +0800
Subject: [PATCH 52/74] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_analysis_for_activity.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go
index 8193da6be..99ff990ce 100644
--- a/models/user_analysis_for_activity.go
+++ b/models/user_analysis_for_activity.go
@@ -454,10 +454,15 @@ func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
 	log.Info("userId=" + fmt.Sprint(userId))
-	var re *UserSummaryCurrentYear
-	_, err := statictisSess.Table(new(UserSummaryCurrentYear)).ID(userId).Get(re)
-	if err != nil {
+
+	reList := make([]*UserSummaryCurrentYear, 0)
+	err := statictisSess.Select("*").Table(new(UserSummaryCurrentYear)).Where("id=" + fmt.Sprint(userId)).Find(&reList)
+	if err == nil {
+		if len(reList) > 0 {
+			return reList[0]
+		}
+	} else {
 		log.Info("error:=" + err.Error())
 	}
-	return re
+	return nil
 }

From d5265c79ad456f15e3a17aaf09a8094e426dd687 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 7 Dec 2022 10:20:09 +0800
Subject: [PATCH 53/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index 0043c4344..f42d6cd20 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -137,6 +137,7 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 				monthUserMetrics := &UserMetrics{
 					DisplayDate:                month,
 					ActivateRegistUser:         userMetrics.ActivateRegistUser,
+					RegistActivityUser:         userMetrics.RegistActivityUser,
 					NotActivateRegistUser:      userMetrics.NotActivateRegistUser,
 					TotalUser:                  userMetrics.TotalUser,
 					TotalNotActivateRegistUser: userMetrics.TotalUser - userMetrics.TotalActivateRegistUser,
@@ -152,6 +153,7 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 				value.ActivateRegistUser += userMetrics.ActivateRegistUser
 				value.NotActivateRegistUser += userMetrics.NotActivateRegistUser
 				value.HasActivityUser += userMetrics.HasActivityUser
+				value.RegistActivityUser += userMetrics.RegistActivityUser
 				value.TotalRegistUser += userMetrics.ActivateRegistUser + userMetrics.NotActivateRegistUser
 				value.ActivateIndex = float64(value.ActivateRegistUser) / float64(value.TotalRegistUser)
 				value.DaysForMonth += 1

From e77df3be972c59a45957f452edfaf6042725563b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 7 Dec 2022 10:26:16 +0800
Subject: [PATCH 54/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_business_analysis.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go
index f42d6cd20..ca1eb4c7b 100644
--- a/models/user_business_analysis.go
+++ b/models/user_business_analysis.go
@@ -132,7 +132,12 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics {
 	if count > 0 {
 		for _, userMetrics := range allUserInfo {
 			dateTime := time.Unix(userMetrics.CountDate, 0)
-			month := fmt.Sprint(dateTime.Year()) + "-" + fmt.Sprint(int(dateTime.Month()))
+			mInt := int(dateTime.Month())
+			mString := fmt.Sprint(mInt)
+			if mInt < 10 {
+				mString = "0" + mString
+			}
+			month := fmt.Sprint(dateTime.Year()) + "-" + mString
 			if _, ok := monthMap[month]; !ok {
 				monthUserMetrics := &UserMetrics{
 					DisplayDate:                month,

From ebc825c0652f552a8f4a2178892652a49830f867 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 7 Dec 2022 11:46:25 +0800
Subject: [PATCH 55/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=95=B0=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index e57946365..1dfcc7588 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -580,7 +580,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Get("/query_metrics_current_month", operationReq, repo_ext.QueryUserMetricsCurrentMonth)
 		m.Get("/query_metrics_current_week", operationReq, repo_ext.QueryUserMetricsCurrentWeek)
-		m.Get("/query_metrics_current_year", operationReq, repo_ext.QueryUserMetricsCurrentYear)
+		m.Get("/query_metrics_current_year", repo_ext.QueryUserMetricsCurrentYear)
 		m.Get("/query_metrics_last30_day", operationReq, repo_ext.QueryUserMetricsLast30Day)
 		m.Get("/query_metrics_last_month", operationReq, repo_ext.QueryUserMetricsLastMonth)
 		m.Get("/query_metrics_yesterday", operationReq, repo_ext.QueryUserMetricsYesterday)

From 7d68b44af6fe69152301a1d7275bb7c0e8bb2f0f Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 7 Dec 2022 15:43:44 +0800
Subject: [PATCH 56/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/modelmanage.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/api/v1/repo/modelmanage.go b/routers/api/v1/repo/modelmanage.go
index 15260790d..3989ec56c 100644
--- a/routers/api/v1/repo/modelmanage.go
+++ b/routers/api/v1/repo/modelmanage.go
@@ -45,6 +45,7 @@ func QueryModelById(ctx *context.APIContext) {
 
 func QueryModelListForPredict(ctx *context.APIContext) {
 	log.Info("QueryModelListForPredict by api.")
+	ctx.Context.SetParams("isOnlyThisRepo", "true")
 	routerRepo.QueryModelListForPredict(ctx.Context)
 }
 

From 2115b39496727994161d4abfe15b3631e27be204 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 11:09:58 +0800
Subject: [PATCH 57/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index c03fa8703..41790e23f 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1050,10 +1050,11 @@ func ShowModelPageInfo(ctx *context.Context) {
 			Page:     page,
 			PageSize: pageSize,
 		},
-		RepoID: repoId,
-		Type:   Type,
-		New:    MODEL_LATEST,
-		Status: -1,
+		RepoID:         repoId,
+		Type:           Type,
+		New:            MODEL_LATEST,
+		IsOnlyThisRepo: true,
+		Status:         -1,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)
@@ -1193,7 +1194,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = -1
 	}
-	IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo")
+	//IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo")
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
 		ListOptions: models.ListOptions{
 			Page:     page,
@@ -1203,7 +1204,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 		Type:           ctx.QueryInt("type"),
 		New:            -1,
 		Status:         0,
-		IsOnlyThisRepo: IsOnlyThisRepo,
+		IsOnlyThisRepo: true,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)

From 5faf526b036e187e8cdf63f0169a0e9438a5ee81 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 11:11:53 +0800
Subject: [PATCH 58/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go |  9 +++++----
 routers/repo/modelarts.go       | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 41790e23f..9443400a5 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -963,10 +963,11 @@ func SetModelCount(ctx *context.Context) {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID: repoId,
-		Type:   Type,
-		New:    MODEL_LATEST,
-		Status: -1,
+		RepoID:         repoId,
+		Type:           Type,
+		New:            MODEL_LATEST,
+		IsOnlyThisRepo: true,
+		Status:         -1,
 	})
 	ctx.Data["MODEL_COUNT"] = count
 }
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 01d2e2fa4..2c6a806bd 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2345,10 +2345,11 @@ func InferenceJobIndex(ctx *context.Context) {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID: repoId,
-		Type:   Type,
-		New:    MODEL_LATEST,
-		Status: 0,
+		RepoID:         repoId,
+		Type:           Type,
+		New:            MODEL_LATEST,
+		IsOnlyThisRepo: true,
+		Status:         0,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 
@@ -2425,10 +2426,11 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 			Page:     1,
 			PageSize: 2,
 		},
-		RepoID: repoId,
-		Type:   Type,
-		New:    MODEL_LATEST,
-		Status: 0,
+		RepoID:         repoId,
+		Type:           Type,
+		New:            MODEL_LATEST,
+		IsOnlyThisRepo: true,
+		Status:         0,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo

From 638afc124351a4411363c02f9b62713519a61a87 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 15:55:54 +0800
Subject: [PATCH 59/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 9443400a5..67b592d1a 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -998,7 +998,7 @@ func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
 	if ctx.User == nil {
 		return false
 	}
-	if ctx.User.IsAdmin || ctx.User.ID == task.UserId {
+	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || ctx.Repo.HasAccess() {
 		return true
 	}
 	if !task.IsPrivate {

From 3e781ca2050ba9505a6255dfcffba914a1470c11 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 16:15:11 +0800
Subject: [PATCH 60/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 67b592d1a..3a9ff88ba 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -998,7 +998,11 @@ func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
 	if ctx.User == nil {
 		return false
 	}
-	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || ctx.Repo.HasAccess() {
+	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
+	if err != nil {
+		log.Info("query error.")
+	}
+	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || isCollaborator {
 		return true
 	}
 	if !task.IsPrivate {

From dc73e597a49862689dd72b1a77bb9e77b537229e Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 17:40:33 +0800
Subject: [PATCH 61/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 3a9ff88ba..7fc9155d1 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1005,6 +1005,9 @@ func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
 	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || isCollaborator {
 		return true
 	}
+	if ctx.Repo.IsOwner() {
+		return true
+	}
 	if !task.IsPrivate {
 		return true
 	}

From ae91dc55fb04c6ff4ace38088e46cdf32631d1fe Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Thu, 8 Dec 2022 17:43:59 +0800
Subject: [PATCH 62/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7fc9155d1..f56b93355 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1034,6 +1034,9 @@ func isOperModifyOrDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
 		return true
 	}
+	if ctx.Repo.IsOwner() {
+		return true
+	}
 	return false
 }
 

From 04e41d90539d015811d95c745fd34e0ed37f5daf Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 9 Dec 2022 09:44:26 +0800
Subject: [PATCH 63/74] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=8F=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go                     |  9 +++++----
 routers/repo/ai_model_manage.go               | 19 +++++++++++++++++++
 .../local/modelmanage-local-create-1.vue      | 13 ++++++++++---
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index 6f791010f..f6836781c 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -89,6 +89,7 @@ type AiModelQueryOptions struct {
 	Type           int
 	Status         int
 	IsOnlyThisRepo bool
+	IsQueryPrivate bool
 }
 
 func (a *AiModelConvert) IsGpuTrainTask() bool {
@@ -428,10 +429,10 @@ func QueryModel(opts *AiModelQueryOptions) ([]*AiModelManage, int64, error) {
 			builder.Eq{"ai_model_manage.status": opts.Status},
 		)
 	}
-	if !opts.IsOnlyThisRepo {
-		orCon := builder.NewCond()
-		orCon = orCon.And(builder.Eq{"ai_model_manage.is_private": false})
-		cond = cond.Or(orCon)
+	if !opts.IsQueryPrivate {
+		cond = cond.And(
+			builder.Eq{"ai_model_manage.is_private": false},
+		)
 	}
 	count, err := sess.Where(cond).Count(new(AiModelManage))
 	if err != nil {
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index f56b93355..63ef4bf80 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1014,6 +1014,23 @@ func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
 	return false
 }
 
+func isQueryPrivateModel(ctx *context.Context) bool {
+	if ctx.User == nil {
+		return false
+	}
+	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
+	if err != nil {
+		log.Info("query error.")
+	}
+	if ctx.User.IsAdmin || isCollaborator {
+		return true
+	}
+	if ctx.Repo.IsOwner() {
+		return true
+	}
+	return false
+}
+
 func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
@@ -1054,6 +1071,7 @@ func ShowModelPageInfo(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = setting.UI.IssuePagingNum
 	}
+	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
@@ -1066,6 +1084,7 @@ func ShowModelPageInfo(ctx *context.Context) {
 		New:            MODEL_LATEST,
 		IsOnlyThisRepo: true,
 		Status:         -1,
+		IsQueryPrivate: isQueryPrivate,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)
diff --git a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
index 32c64d4c7..fbbdecfe2 100644
--- a/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
+++ b/web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue
@@ -90,7 +90,7 @@
           <div class="r-title"><label>{{ $t('modelManage.modelAccess') }}</label></div>
           <div class="field">
             <div class="ui radio checkbox">
-              <input type="radio" name="isPrivate" checked="checked" value="false">
+              <input id="isPrivate_false" type="radio" name="isPrivate" checked="checked" value="false">
               <label>{{ $t('modelManage.modelAccessPublic') }}</label>
             </div>
           </div>
@@ -99,7 +99,7 @@
           </div>
           <div class="field">
               <div class="ui radio checkbox">
-                <input type="radio" name="isPrivate" value="true">
+                <input id="isPrivate_true" type="radio" name="isPrivate" value="true">
                 <label>{{ $t('modelManage.modelAccessPrivate') }}</label>
               </div>
           </div>
@@ -152,7 +152,7 @@ export default {
         engine: '0',
         label: '',
         description: '',
-        isPrivate : 'false',
+        isPrivate : false,
       },
       nameErr: false,
       isShowVersion: false,
@@ -257,6 +257,13 @@ export default {
           this.state.label = data.label;
           this.state.description = data.description;
           this.state.isPrivate = data.isPrivate;
+          if(data.isPrivate){
+              $('#isPrivate_true').attr("checked",true);
+              $('#isPrivate_false').attr("checked",false);
+          }else{
+              $('#isPrivate_true').attr("checked",false);
+              $('#isPrivate_false').attr("checked",true);
+          }
         }
       }).catch(err => {
         this.loading = false;

From a2fc7c18f99a26b4d1ade86aa40d701c3288af5d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 9 Dec 2022 11:12:43 +0800
Subject: [PATCH 64/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=8E=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 63ef4bf80..7bd286602 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -956,6 +956,7 @@ func ShowOneVersionOtherModel(ctx *context.Context) {
 }
 
 func SetModelCount(ctx *context.Context) {
+	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -968,6 +969,7 @@ func SetModelCount(ctx *context.Context) {
 		New:            MODEL_LATEST,
 		IsOnlyThisRepo: true,
 		Status:         -1,
+		IsQueryPrivate: isQueryPrivate,
 	})
 	ctx.Data["MODEL_COUNT"] = count
 }
@@ -1224,6 +1226,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 	if pageSize <= 0 {
 		pageSize = -1
 	}
+	isQueryPrivate := isQueryPrivateModel(ctx)
 	//IsOnlyThisRepo := ctx.QueryBool("isOnlyThisRepo")
 	modelResult, count, err := models.QueryModel(&models.AiModelQueryOptions{
 		ListOptions: models.ListOptions{
@@ -1235,6 +1238,7 @@ func QueryModelListForPredict(ctx *context.Context) {
 		New:            -1,
 		Status:         0,
 		IsOnlyThisRepo: true,
+		IsQueryPrivate: isQueryPrivate,
 	})
 	if err != nil {
 		ctx.ServerError("Cloudbrain", err)

From c52a2b019a542082604804bb9c68ac6949644c1a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 9 Dec 2022 11:15:34 +0800
Subject: [PATCH 65/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/modelarts.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 2c6a806bd..4e30e625d 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -2337,7 +2337,7 @@ func InferenceJobIndex(ctx *context.Context) {
 			tasks[i].ComputeResource = models.NPUResource
 		}
 	}
-
+	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, model_count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -2350,6 +2350,7 @@ func InferenceJobIndex(ctx *context.Context) {
 		New:            MODEL_LATEST,
 		IsOnlyThisRepo: true,
 		Status:         0,
+		IsQueryPrivate: isQueryPrivate,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 
@@ -2418,7 +2419,7 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 		return err
 	}
 	ctx.Data["config_list"] = configList.ParaConfigs
-
+	isQueryPrivate := isQueryPrivateModel(ctx)
 	repoId := ctx.Repo.Repository.ID
 	Type := -1
 	_, model_count, _ := models.QueryModel(&models.AiModelQueryOptions{
@@ -2431,6 +2432,7 @@ func inferenceJobNewDataPrepare(ctx *context.Context) error {
 		New:            MODEL_LATEST,
 		IsOnlyThisRepo: true,
 		Status:         0,
+		IsQueryPrivate: isQueryPrivate,
 	})
 	ctx.Data["MODEL_COUNT"] = model_count
 	ctx.Data["datasetType"] = models.TypeCloudBrainTwo

From 9dcd20584c163d08ef957ef719c8128b262bbbf5 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 10:14:49 +0800
Subject: [PATCH 66/74] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/ai_model_manage.go       | 5 +++--
 routers/repo/ai_model_manage.go | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/models/ai_model_manage.go b/models/ai_model_manage.go
index f6836781c..4fe74e555 100644
--- a/models/ai_model_manage.go
+++ b/models/ai_model_manage.go
@@ -306,15 +306,16 @@ func ModifyModelPrivate(id string, isPrivate bool) error {
 	return nil
 }
 
-func ModifyLocalModel(id string, name, label, description string, engine int) error {
+func ModifyLocalModel(id string, name, label, description string, engine int, isPrivate bool) error {
 	var sess *xorm.Session
 	sess = x.ID(id)
 	defer sess.Close()
-	re, err := sess.Cols("name", "label", "description", "engine").Update(&AiModelManage{
+	re, err := sess.Cols("name", "label", "description", "engine", "is_private").Update(&AiModelManage{
 		Description: description,
 		Name:        name,
 		Label:       label,
 		Engine:      int64(engine),
+		IsPrivate:   isPrivate,
 	})
 	if err != nil {
 		return err
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 7bd286602..4884a815f 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1182,6 +1182,7 @@ func ModifyModelInfo(ctx *context.Context) {
 		label := ctx.Query("label")
 		description := ctx.Query("description")
 		engine := ctx.QueryInt("engine")
+		isPrivate := ctx.QueryBool("isPrivate")
 		aimodels := models.QueryModelByName(name, task.RepoId)
 		if aimodels != nil && len(aimodels) > 0 {
 			if len(aimodels) == 1 {
@@ -1196,14 +1197,14 @@ func ModifyModelInfo(ctx *context.Context) {
 				return
 			}
 		}
-		err = models.ModifyLocalModel(id, name, label, description, engine)
+		err = models.ModifyLocalModel(id, name, label, description, engine, isPrivate)
 
 	} else {
 		label := ctx.Query("label")
 		description := ctx.Query("description")
 		engine := task.Engine
 		name := task.Name
-		err = models.ModifyLocalModel(id, name, label, description, int(engine))
+		err = models.ModifyLocalModel(id, name, label, description, int(engine), task.IsPrivate)
 	}
 
 	if err != nil {

From a48afce01d1ee25c5e92d7b93f9fb652c59f12b8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 11:00:45 +0800
Subject: [PATCH 67/74] =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index fa1515f3c..4545601fb 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -100,9 +100,9 @@
              <span class="text-over" :title="scope.row.status_title">
                 <i style="vertical-align: middle" :class="scope.row.status"></i
               ></span>
-             <span class="text-over" :title="scope.row.isPrivate">
-                {{transStatus(scope.row.isPrivate)}}
-             </span>
+            <span style="color: #fa8c16;" v-if="scope.row.isPrivate">{{ i18n.modelaccess_private }}</span>
+            <span style="color: #13c28d;" v-else="!scope.row.isPrivate">{{ i18n.modelaccess_public }}</span>
+          
             </template>
           </el-table-column>
 

From b209d32d1415fdde3d87c0bf56d442146b564704 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 11:10:44 +0800
Subject: [PATCH 68/74] =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=8F=8A=E5=85=AC?=
 =?UTF-8?q?=E6=9C=89=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 web_src/js/components/Model.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue
index 4545601fb..315b7f214 100644
--- a/web_src/js/components/Model.vue
+++ b/web_src/js/components/Model.vue
@@ -149,10 +149,10 @@
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>              
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper"  @click="
+                <a class="op-btn" style="color: #13c28d;" v-show="repoIsPrivate == false && scope.row.isPrivate==true && scope.row.isCanOper"  @click="
                     modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,false)
                   ">{{ i18n.modelaccess_setpublic }}</a>
-                <a class="op-btn" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper"  @click="
+                <a class="op-btn" style="color: #fa8c16;" v-show="repoIsPrivate == false && scope.row.isPrivate==false && scope.row.isCanOper"  @click="
                     modifyModelStatus(scope.row.id, scope.row.cName, scope.row.rowKey,true)
                   ">{{ i18n.modelaccess_setprivate }}</a>
                 

From 1314893730d4e77654fea525c36bd2abd219ee99 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 11:38:44 +0800
Subject: [PATCH 69/74] =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=8F=8A=E5=85=AC?=
 =?UTF-8?q?=E6=9C=89=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 4884a815f..1155f3239 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1022,9 +1022,13 @@ func isQueryPrivateModel(ctx *context.Context) bool {
 	}
 	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
 	if err != nil {
-		log.Info("query error.")
+		log.Info("query IsCollaborator error." + err.Error())
+	}
+	isTeamMember, err := ctx.Repo.Repository.IsInRepoTeam(ctx.User.ID)
+	if err != nil {
+		log.Info("query IsInRepoTeam error." + err.Error())
 	}
-	if ctx.User.IsAdmin || isCollaborator {
+	if ctx.User.IsAdmin || isCollaborator || isTeamMember {
 		return true
 	}
 	if ctx.Repo.IsOwner() {

From d0ed6ba4b42c4fa7e96d5bda23fd180d5cb93978 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 11:44:05 +0800
Subject: [PATCH 70/74] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=9B=A2=E9=98=9F=E7=A7=81=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 1155f3239..205660402 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1004,7 +1004,11 @@ func isCanDownload(ctx *context.Context, task *models.AiModelManage) bool {
 	if err != nil {
 		log.Info("query error.")
 	}
-	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || isCollaborator {
+	isTeamMember, err := ctx.Repo.Repository.IsInRepoTeam(ctx.User.ID)
+	if err != nil {
+		log.Info("query IsInRepoTeam error." + err.Error())
+	}
+	if ctx.User.IsAdmin || ctx.User.ID == task.UserId || isCollaborator || isTeamMember {
 		return true
 	}
 	if ctx.Repo.IsOwner() {

From 74c2ba555e9dd0be76dd6ef25c6eb730100c54a4 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 14:47:57 +0800
Subject: [PATCH 71/74] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8D=8F=E4=BD=9C=E8=80=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 205660402..8daab501b 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1051,6 +1051,13 @@ func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.Repo.IsOwner() {
 		return true
 	}
+	isRepoOwnerCollaborator, err := ctx.Repo.Repository.IsOwnerMemberCollaborator(ctx.User.ID)
+	if err != nil {
+		log.Info("query isRepoOwnerCollaborator error." + err.Error())
+	}
+	if isRepoOwnerCollaborator {
+		return true
+	}
 	return false
 }
 
@@ -1061,9 +1068,17 @@ func isOperModifyOrDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
 		return true
 	}
+
 	if ctx.Repo.IsOwner() {
 		return true
 	}
+	isRepoOwnerCollaborator, err := ctx.Repo.Repository.IsOwnerMemberCollaborator(ctx.User.ID)
+	if err != nil {
+		log.Info("query isRepoOwnerCollaborator error." + err.Error())
+	}
+	if isRepoOwnerCollaborator {
+		return true
+	}
 	return false
 }
 

From 29e9483fe51f7c24c14267c9cf75c2aa54cf8dde Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 15:19:04 +0800
Subject: [PATCH 72/74] =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E8=80=85=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 8daab501b..3bc7740b6 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1045,18 +1045,36 @@ func isCanDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User == nil {
 		return false
 	}
-	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
+	if ctx.User.ID == modelUserId {
+		return true
+	}
+	return isAdminRight(ctx)
+}
+
+func isAdminRight(ctx *context.Context) bool {
+	if ctx.User.IsAdmin {
 		return true
 	}
 	if ctx.Repo.IsOwner() {
 		return true
 	}
-	isRepoOwnerCollaborator, err := ctx.Repo.Repository.IsOwnerMemberCollaborator(ctx.User.ID)
+	if ctx.Repo.Owner.IsOrganization() {
+		isOwner, err := ctx.Repo.Owner.IsOwnedBy(ctx.User.ID)
+		if err != nil {
+			return false
+		} else if isOwner {
+			return true
+		}
+	}
+	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
 	if err != nil {
-		log.Info("query isRepoOwnerCollaborator error." + err.Error())
+		log.Info("query IsCollaborator error." + err.Error())
 	}
-	if isRepoOwnerCollaborator {
-		return true
+	if isCollaborator {
+		mode := ctx.Repo.Repository.GetCollaboratorMode(ctx.User.ID)
+		if mode >= 3 {
+			return true
+		}
 	}
 	return false
 }
@@ -1068,18 +1086,7 @@ func isOperModifyOrDelete(ctx *context.Context, modelUserId int64) bool {
 	if ctx.User.IsAdmin || ctx.User.ID == modelUserId {
 		return true
 	}
-
-	if ctx.Repo.IsOwner() {
-		return true
-	}
-	isRepoOwnerCollaborator, err := ctx.Repo.Repository.IsOwnerMemberCollaborator(ctx.User.ID)
-	if err != nil {
-		log.Info("query isRepoOwnerCollaborator error." + err.Error())
-	}
-	if isRepoOwnerCollaborator {
-		return true
-	}
-	return false
+	return isAdminRight(ctx)
 }
 
 func ShowModelPageInfo(ctx *context.Context) {

From e0ceda486b3991fdd757d53544aa689cca62221c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 15:29:06 +0800
Subject: [PATCH 73/74] =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E8=80=85=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/ai_model_manage.go | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index 3bc7740b6..6e6889c32 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -1058,23 +1058,13 @@ func isAdminRight(ctx *context.Context) bool {
 	if ctx.Repo.IsOwner() {
 		return true
 	}
-	if ctx.Repo.Owner.IsOrganization() {
-		isOwner, err := ctx.Repo.Owner.IsOwnedBy(ctx.User.ID)
-		if err != nil {
-			return false
-		} else if isOwner {
-			return true
-		}
-	}
-	isCollaborator, err := ctx.Repo.Repository.IsCollaborator(ctx.User.ID)
+	permission, err := models.GetUserRepoPermission(ctx.Repo.Repository, ctx.User)
 	if err != nil {
-		log.Info("query IsCollaborator error." + err.Error())
+		log.Error("GetUserRepoPermission failed:%v", err.Error())
+		return false
 	}
-	if isCollaborator {
-		mode := ctx.Repo.Repository.GetCollaboratorMode(ctx.User.ID)
-		if mode >= 3 {
-			return true
-		}
+	if permission.AccessMode >= models.AccessModeAdmin {
+		return true
 	}
 	return false
 }

From d59bc801296c06f394b8e6243f298f7c326b7ace Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Mon, 12 Dec 2022 16:33:36 +0800
Subject: [PATCH 74/74] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 15fc57107..309a484ce 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -580,7 +580,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 		m.Get("/query_metrics_current_month", operationReq, repo_ext.QueryUserMetricsCurrentMonth)
 		m.Get("/query_metrics_current_week", operationReq, repo_ext.QueryUserMetricsCurrentWeek)
-		m.Get("/query_metrics_current_year", repo_ext.QueryUserMetricsCurrentYear)
+		m.Get("/query_metrics_current_year", operationReq, repo_ext.QueryUserMetricsCurrentYear)
 		m.Get("/query_metrics_last30_day", operationReq, repo_ext.QueryUserMetricsLast30Day)
 		m.Get("/query_metrics_last_month", operationReq, repo_ext.QueryUserMetricsLastMonth)
 		m.Get("/query_metrics_yesterday", operationReq, repo_ext.QueryUserMetricsYesterday)