Merge branch 'fix-1591' of https://git.openi.org.cn/OpenI/aiforge into fix-1591

models/repo.go

@@ -1583,7 +1583,7 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 				return err
 			}
 			//If repo has become private, we need set dataset and dataset_file to private
-			_, err = e.Where("repo_id = ?", repo.ID).Cols("status").Update(&Dataset{
+			_, err = e.Where("repo_id = ? and status <> 2", repo.ID).Cols("status").Update(&Dataset{
 				Status: 0,
 			})
 			if err != nil {
@@ -1601,6 +1601,15 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 				return err
 			}
 
+		} else {
+			//If repo has become public, we need set dataset to public
+			_, err = e.Where("repo_id = ? and status <> 2", repo.ID).Cols("status").Update(&Dataset{
+				Status: 1,
+			})
+			if err != nil {
+				return err
+			}
+
 		}
 
 		// Create/Remove git-daemon-export-ok for git-daemon...

options/locale/locale_en-US.ini

@@ -790,7 +790,11 @@ attachment.delete_desc= Are you sure you will delete this version of dataset, on
 public= public
 private= private
 delete= delete
-
+select_dataset=Select Dataset
+current_project=Current Project
+owner_dataset=Owner Dataset
+public_dataset=Public Dataset
+I_liked = I Liked
 [repo]
 owner = Owner
 repo_name = Repository Name

options/locale/locale_zh-CN.ini

@@ -795,7 +795,11 @@ attachment.delete_desc= 你确定要删除该版本的数据集么？一旦删
 public=公有
 private=私有
 delete=删除
-
+select_dataset=选择数据集
+current_project=当前项目
+owner_dataset=我的数据集
+public_dataset=公开数据集
+I_liked=我点赞的
 [repo]
 owner=拥有者
 repo_name=项目名称

routers/repo/dataset.go

@@ -110,16 +110,6 @@ func DatasetIndex(ctx *context.Context) {
 	repo := ctx.Repo.Repository
 
 	dataset, err := models.GetDatasetByRepo(repo)
-	canRead := false
-	if ctx.IsSigned {
-		isCollaborator, err := repo.IsCollaborator(ctx.User.ID)
-		if err != nil {
-			canRead = false
-		} else if ctx.User.IsAdmin || isCollaborator {
-			canRead = true
-		}
-	}
-	ctx.Data["CanRead"] = canRead
 	ctx.Data["CanWrite"] = ctx.Repo.CanWrite(models.UnitTypeDatasets)
 	if err != nil {
 		log.Warn("query dataset, not found.")

templates/custom/select_dataset.tmpl

@@ -1,17 +1,11 @@
 <div class="dataset-repolink" id="dataset-repolink-init" style="display: none;" data-repolink="{{.RepoLink}}" data-cloudranin-type="{{.cloudbraintype}}"></div>
 <div class="inline required field" id="dataset-base">
-    <label>数据集</label>
-    <!-- <select id="cloudbrain_dataset" class="ui search dropdown" placeholder="选择数据集" style='width:385px' name="attachment" required> 
-
-        {{range .attachments}}
-            <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
-        {{end}}
-    </select> -->
+    <label>{{.i18n.Tr "dataset.dataset"}}</label>
     <input type="hidden" name="attachment" :value="dataset_uuid">
     <input type="text" :value="dataset_name">
-    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus"> 选择数据集</el-button>
+    <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus"> {{.i18n.Tr "dataset.select_dataset"}}</el-button>
     <el-dialog
-    title="选择数据集"
+    title="{{.i18n.Tr "dataset.select_dataset"}}"
     :visible.sync="dialogVisible"
     width="50%"
     >
@@ -21,7 +15,7 @@
     </div>
     
     <el-tabs v-model="activeName" @tab-click="handleClick('{{.RepoLink}}',activeName,{{.cloudbraintype}})">
-        <el-tab-pane label="当前项目" name="first">
+        <el-tab-pane label="{{.i18n.Tr "dataset.current_project"}}" name="first">
             <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in currentRepoDataset" :key="index">
                 <div style="width: 90%;">
                     <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias} </span><span class="panel_dataset_name">${dataset.Name} </span></div>
@@ -39,7 +33,7 @@
             
             
         </el-tab-pane>
-        <el-tab-pane label="我的数据集" name="second">
+        <el-tab-pane label="{{.i18n.Tr "dataset.owner_dataset"}}" name="second">
             <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myDataset" :key="index">
                 <div style="width: 90%;">
                     <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><span class="panel_dataset_name">${dataset.Name}</span></div>
@@ -56,7 +50,7 @@
             </div>
 
         </el-tab-pane>
-        <el-tab-pane label="公开数据集" name="third">
+        <el-tab-pane label="{{.i18n.Tr "dataset.public_dataset"}}" name="third">
             <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in publicDataset" :key="index">
                 <div style="width: 90%;">
                     <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><span class="panel_dataset_name">${dataset.Name}</span></div>
@@ -73,7 +67,7 @@
             </div>
 
         </el-tab-pane>
-        <el-tab-pane label="我点赞的" name="fourth">
+        <el-tab-pane label="{{.i18n.Tr "dataset.I_liked"}}" name="fourth">
             <div style="display: flex;align-items: center;justify-content: space-between;padding: 1rem 0;border-bottom:1px solid #F5F5F5" v-for="(dataset,index) in myFavoriteDataset" :key="index">
                 <div style="width: 90%;">
                     <div style="display: flex;align-items: center;"><span class="panel_creator_reponam">${dataset.Repo.OwnerName}/${dataset.Repo.Alias}</span><span class="panel_dataset_name">${dataset.Name}</span></div>