models/dataset.go

@@ -63,19 +63,20 @@ func (datasets DatasetList) loadAttributes(e Engine) error {
 	}
 
 	set := make(map[int64]struct{})
+	userIdSet := make(map[int64]struct{})
 	datasetIDs := make([]int64, len(datasets))
 	for i := range datasets {
-		set[datasets[i].UserID] = struct{}{}
+		userIdSet[datasets[i].UserID] = struct{}{}
 		set[datasets[i].RepoID] = struct{}{}
 		datasetIDs[i] = datasets[i].ID
 	}
 
 	// Load owners.
-	users := make(map[int64]*User, len(set))
+	users := make(map[int64]*User, len(userIdSet))
 	repos := make(map[int64]*Repository, len(set))
 	if err := e.
 		Where("id > 0").
-		In("id", keysInt64(set)).
+		In("id", keysInt64(userIdSet)).
 		Find(&users); err != nil {
 		return fmt.Errorf("find users: %v", err)
 	}

templates/explore/datasets.tmpl

@@ -121,10 +121,10 @@
 								<i class="dropdown icon"></i>
 								</span>
 								<div class="menu">
-									<a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
-									<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
-									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+									<a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+									<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
+									<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+									<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
 									<!-- <a class="{{if eq .SortType "downloadtimes"}}active{{end}} item" href="{{$.Link}}?sort=downloadtimes&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}}</a> -->
 								</div>
 							</div>
@@ -184,9 +184,15 @@
 								</div>
 								<div class="extra content" style="border-top: none !important;">
 									<div style="display: flex;align-items: center;">
+										{{if eq .UserID 0}}
 										<a href="{{AppSubUrl}}/{{.Repo.OwnerName}}" title="{{.Repo.OwnerName}}">
 											<img class="ui avatar image" style="width: 22px;height:22px;"  src="/user/avatar/{{.Repo.OwnerName}}/-1">
 										</a>
+										{{else}}
+										<a href="{{AppSubUrl}}/{{.User.Name}}" title="{{.User.Name}}">
+											<img class="ui avatar image" style="width: 22px;height:22px;"  src="/user/avatar/{{.User.Name}}/-1">
+										</a>
+										{{end}}
 										<span style="color: #999999;font-size: 14px;;">创建于：{{TimeSinceUnix1 .CreatedUnix}}</span>
 									</div>
 								</div>
@@ -215,4 +221,4 @@
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}