diff --git a/models/repo.go b/models/repo.go
index 9bb4b9d03..d8dda45f9 100755
--- a/models/repo.go
+++ b/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...
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index cae92591b..c98871f57 100755
--- a/options/locale/locale_en-US.ini
+++ b/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
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 631d5e222..27f2bf23b 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/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=项目名称
diff --git a/routers/repo/dataset.go b/routers/repo/dataset.go
index 22a15b172..ad1944b1e 100755
--- a/routers/repo/dataset.go
+++ b/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.")
diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl
index ef1544e74..a09849817 100644
--- a/templates/custom/select_dataset.tmpl
+++ b/templates/custom/select_dataset.tmpl
@@ -1,17 +1,11 @@
-
-
+
- 选择数据集
+ {{.i18n.Tr "dataset.select_dataset"}}
@@ -21,7 +15,7 @@
-
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias} ${dataset.Name}
@@ -39,7 +33,7 @@
-
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
@@ -56,7 +50,7 @@
-
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
@@ -73,7 +67,7 @@
-
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}