From 6d3d28eb2105f19fa0011a2b9283a2b20e9c67a0 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 20 Dec 2012 12:29:14 +0000
Subject: [PATCH] [MRM-1684] feeds link behaviour seems not coherent

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1424433 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/js/archiva/search.js      |  1 +
 .../webapp/js/templates/archiva/search.html   | 51 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index d65d152b6..c0b31c5c4 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -1008,6 +1008,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
                   mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" )
                                                                      .tmpl({repositories:data,selected:repositoryId,feedsUrl:feedsUrl}));
                 }else{
+                  feedsUrl+="/feeds";
                   mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" )
                                                                      .tmpl({repositories:data,selected:"",feedsUrl:null}));
                 }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index ed2466f46..d072336a5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -51,32 +51,33 @@
       {{/if}}
       {{each(i,browseResultEntry) browseResultEntries}}
       {{if browseResultEntry.project}}
-      {{if deleteKarma}}
-      <li class="browse-list-project">
-        <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
-             data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
-        <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-      </li>
+        {{if deleteKarma}}
+          <li class="browse-list-project">
+            <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
+                 data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
+            <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+            <a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"/></a>
+          </li>
+        {{else}}
+          <li class="browse-list-project">
+            <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+            <a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"/></a>
+          </li>
+        {{/if}}
       {{else}}
-      <li class="browse-list-project">
-        <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-        <a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"></img></a>
-      </li>
-      {{/if}}
-      {{else}}
-      {{if deleteKarma}}
-      <li class="browse-list">
-        <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
-             data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
-        <a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
-           title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-      </li>
-      {{else}}
-      <li class="browse-list">
-        <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
-           data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-      </li>
-      {{/if}}
+        {{if deleteKarma}}
+          <li class="browse-list">
+            <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
+                 data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
+            <a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
+               title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+          </li>
+        {{else}}
+          <li class="browse-list">
+            <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
+               data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+          </li>
+        {{/if}}
       {{/if}}
 
       {{/each}}