Merge pull request go-gitea#1750 from andreynering/dashboard-search-o…

…rg-repos More fixes for dashboard search
young21 · May 27, 2017 · e67ece2 · e67ece2
2 parents bafd778 + 12dbdaa
commit e67ece2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 25 deletions.
diff --git a/public/js/index.js b/public/js/index.js
@@ -1661,7 +1661,7 @@ function initDashboardSearch() {
             repos: [],
             searchQuery: '',
             suburl: document.querySelector('meta[name=_suburl]').content,
-            uid: document.querySelector('meta[name=_uid]').content
+            uid: document.querySelector('meta[name=_context_uid]').content
         },
 
         mounted: function() {
@@ -1698,7 +1698,7 @@ function initDashboardSearch() {
                 } else if (repo.mirror) {
                     return 'octicon octicon-repo-clone';
                 } else if (repo.private) {
-                    return 'octicon octicon-repo-forked';
+                    return 'octicon octicon-lock';
                 } else {
                     return 'octicon octicon-repo';
                 }

diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -33,6 +33,9 @@ func Search(ctx *context.APIContext) {
 		OwnerID:  ctx.QueryInt64("uid"),
 		PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
 	}
+	if ctx.User != nil && ctx.User.ID == opts.OwnerID {
+		opts.Searcher = ctx.User
+	}
 
 	// Check visibility.
 	if ctx.IsSigned && opts.OwnerID > 0 {

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -14,6 +14,9 @@
 	{{if .IsSigned}}
 		<meta name="_uid" content="{{.SignedUser.ID}}" />
 	{{end}}
+	{{if .ContextUser}}
+		<meta name="_context_uid" content="{{.ContextUser.ID}}" />
+	{{end}}
 {{if .GoGetImport}}
 	<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">
 	<meta name="go-source" content="{{.GoGetImport}} _ {{.GoDocDirectory}} {{.GoDocFile}}">

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
@@ -46,29 +46,6 @@
 							{{end}}
 						</ul>
 					</div>
-
-					{{if not .ContextUser.IsOrganization}}
-						<h4 class="ui top attached header">
-							{{.i18n.Tr "home.collaborative_repos"}}
-						</h4>
-						<div class="ui attached table segment">
-							<ul id="collaborative-repo-list">
-								{{range .CollaborativeRepos}}
-									<li {{if .IsPrivate}}class="private"{{end}}>
-										<a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">
-											<i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
-											<span class="text truncate owner-and-repo">
-												<span class="text truncate owner-name">{{.Owner.Name}}</span> / <strong>{{.Name}}</strong>
-											</span>
-											<span class="ui right text light grey">
-												{{.NumStars}} <i class="octicon octicon-star rear"></i>
-											</span>
-										</a>
-									</li>
-								{{end}}
-							</ul>
-						</div>
-					{{end}}
 				</div>
 
 				{{if not .ContextUser.IsOrganization}}