Close #99 stop-gap fix for search failure

atcol · atcol · commit cd6d1770801b · 2014-11-09T20:45:23.000Z
diff --git a/grails-app/controllers/docker/registry/web/SearchController.groovy b/grails-app/controllers/docker/registry/web/SearchController.groovy
@@ -10,6 +10,6 @@ class SearchController {
 
     def search(String q) {
         final resultMap = searchService.searchAll(new Search(query: q))
-        render view: "/repository/index", model: [registryToRepoMap: resultMap]
+        render view: "results", model: [registryToRepoMap: resultMap]
     }
 }
diff --git a/grails-app/services/docker/registry/web/SearchService.groovy b/grails-app/services/docker/registry/web/SearchService.groovy
@@ -15,7 +15,6 @@ class SearchService {
         Registry.all.each { Registry registry ->
             searchResults.put(registry, repositoryService.search(registry, search.query))
         }
-
         log.info("Results are $searchResults")
         searchResults
     }
diff --git a/grails-app/views/search/results.gsp b/grails-app/views/search/results.gsp
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="layout" content="main">
+    <title>Docker Registry - Image List</title>
+</head>
+
+<body>
+
+<g:each in="${registryToRepoMap}" var="entry">
+    <g:set var="registry" value="${entry.key}"/>
+    <g:set var="repositories" value="${entry.value}"/>
+
+    <h3>Registry ${registry.host}</h3>
+
+    <table id="imgTbl" class="table table-striped table-hover">
+        <thead>
+            <tr>
+                <th>Tag</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            <g:each in="${repositories}" var="repo">
+                <g:each in="${repo.tags}" var="tag">
+                    <tr>
+                        <td>
+                            <g:link controller="repository" action="show"
+                                params="[registryId: registry.id, repoName: repo.name, tag: tag.name, imgId: tag.imageId]">
+                            <util:generatePullName registry="${registry}" repoName="${repo.name}" tag="${tag.name}"/></g:link>
+                        </td>
+                        <td>
+                            <g:link controller="repository" action="show"
+                                    params="[registryId: registry.id, repoName: repo.name, tag: tag.name, imgId: tag.imageId]">
+                                <asset:image src="icons/link.png" /></asset>
+                            </g:link> |
+                            <a href="#" class="pullImg" data-pullName='<util:generatePullName registry="${registry}" repoName="${repo.name}" tag="${tag.name}"/>'>
+                                <asset:image src="icons/book_download.png"/>
+                            </a> |
+                            <a href="#" class="deleteImg" data-registryId="${registry.id}" data-repoName="${repo.name}" data-tag="${tag.name}">
+                                <asset:image src="icons/garbage.png"/>
+                            </a>
+                        </td>
+                    </tr>
+            </g:each>
+        </tbody>
+        </g:each>
+    </table>
+    <g:if test="${multipleRegistries}">
+        <hr/>
+    </g:if>
+</g:each>
+<jqDT:resources/>
+<g:include view="repository/image-prompts.js.gsp"/>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class SearchController {`
`10`	`10`
`11`	`11`	`def search(String q) {`
`12`	`12`	`final resultMap = searchService.searchAll(new Search(query: q))`
`13`		`- render view: "/repository/index", model: [registryToRepoMap: resultMap]`
	`13`	`+ render view: "results", model: [registryToRepoMap: resultMap]`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ class SearchService {`
`15`	`15`	`Registry.all.each { Registry registry ->`
`16`	`16`	`searchResults.put(registry, repositoryService.search(registry, search.query))`
`17`	`17`	`}`
`18`		`-`
`19`	`18`	`log.info("Results are $searchResults")`
`20`	`19`	`searchResults`
`21`	`20`	`}`