From: Olivier Lamy <olamy@apache.org>
Date: Fri, 17 Feb 2012 22:50:39 +0000 (+0000)
Subject: simply breadcrumb calculation
X-Git-Tag: archiva-1.4-M3~1254
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=40298ae97ba74518a377699b8d9e94a463fb4f95;p=archiva.git

simply breadcrumb calculation

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1245789 13f79535-47bb-0310-9956-ffa450edef68
---

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 1ff45a25e..e76c99a54 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
@@ -43,15 +43,21 @@ $(function() {
     }
 
     breadCrumbEntries=function(){
-      var curBrowseViewModel=self;
-      var entries=[];
-      do{
-        entries.push(curBrowseViewModel.groupId);
-        curBrowseViewModel=curBrowseViewModel.parentBrowseViewModel;
-        if (!curBrowseViewModel) return entries.reverse();
-      }while(curBrowseViewModel.parentBrowseViewModel)
-      return entries.reverse();
+      // root level ?
+      if (!self.parentBrowseViewModel) return [];
+
+      var splitted = self.groupId.split(".");
+      var breadCrumbEntries=[];
+      var curGroupId;
+      for (var i=0;i<splitted.length;i++){
+        curGroupId+=splitted[i];
+        breadCrumbEntries.push(new BreadCrumbEntry(curGroupId,splitted[i]));
+        curGroupId+="."
+      }
+      return breadCrumbEntries;
     }
+
+
   }
 
   findParentGroupId=function(browseViewModel){
@@ -122,6 +128,11 @@ $(function() {
     this.project=project;
   }
 
+  BreadCrumbEntry=function(groupId,displayValue){
+    this.groupId=groupId;
+    this.displayValue=displayValue;
+  }
+
   //-----------------------------------------
   // search part
   //-----------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index ac32be8d1..74bf3daa5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -61,7 +61,9 @@
   <ul class="breadcrumb">
     <li><a href="#" data-bind="click: function(){ browseRoot()}"><i class="icon-home"/>&nbsp;</a>&nbsp;<span class="divider">/</span></li>
     {{each(i,breadCrumbEntry) breadCrumbEntries}}
-      <li><a href="#">${breadCrumbEntry}</a>&nbsp;<span class="divider">/</span></li>
+      <li data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">
+        <a href="#">${breadCrumbEntry.displayValue}</a>&nbsp;<span class="divider">/</span>
+      </li>
     {{/each}}
   </ul>
 </script>
\ No newline at end of file