Author: olamy
Date: Mon Dec 2 04:46:05 2013
New Revision: 1546895
URL: http://svn.apache.org/r1546895
Log:
[MRM-1766] Clicking the ".." when browsing should take you up one level in the
group chain and not "Home"
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js?rev=1546895&r1=1546894&r2=1546895&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
Mon Dec 2 04:46:05 2013
@@ -25,6 +25,7 @@ define("archiva.search",["jquery","i18n"
//-----------------------------------------
BrowseViewModel=function(browseResultEntries,parentBrowseViewModel,groupId,repositoryId,feedsUrl){
+ $.log("BrowseViewModel:"+repositoryId);
var self=this;
this.browseResultEntries=browseResultEntries;
this.parentBrowseViewModel=parentBrowseViewModel;
@@ -41,9 +42,12 @@ define("archiva.search",["jquery","i18n"
}
displayParentGroupId=function(){
$.log("called displayParentGroupId
groupId:"+self.parentBrowseViewModel.groupId);
+
// if null parent is root level
- if (self.parentBrowseViewModel.groupId){
-
displayGroupDetail(self.parentBrowseViewModel.groupId,self.parentBrowseViewModel);
+ if (self.parentBrowseViewModel.groupId &&
self.parentBrowseViewModel.groupId.indexOf(".")>=1){
+ // remove last part of the groupId
+
window.sammyArchivaApplication.setLocation("#browse/"+groupId.substringBeforeLast('.'));
+
//displayGroupDetail(self.parentBrowseViewModel.groupId,self.parentBrowseViewModel);
} else {
browseRoot();
}
@@ -1203,7 +1207,7 @@ define("archiva.search",["jquery","i18n"
var mainContent = $("#main-content");
mainContent.html($("#browse-tmpl" ).tmpl());
mainContent.find("#browse_result").html(mediumSpinnerImg());
- var parentBrowseViewModel=new
BrowseViewModel(null,null,null,repositoryId);
+ var parentBrowseViewModel=new
BrowseViewModel(null,null,groupId,repositoryId);
var
url="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
var
feedsUrl=applicationUrl?applicationUrl:window.location.toString().substringBeforeLast("/").substringBeforeLast("/");
if (repositoryId){
@@ -1532,7 +1536,7 @@ define("archiva.search",["jquery","i18n"
clearUserMessages();
var mainContent = $("#main-content");
mainContent.find("#browse_result").html(mediumSpinnerImg());
- var parentBrowseViewModel=new BrowseViewModel(null,null,null);
+ var parentBrowseViewModel=new BrowseViewModel(null,null,groupId);
displayGroupDetail(groupId,parentBrowseViewModel,null);
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html?rev=1546895&r1=1546894&r2=1546895&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
Mon Dec 2 04:46:05 2013
@@ -45,8 +45,8 @@
<!-- if null we are on root level -->
{{if $root.parentBrowseViewModel}}
- <li class="browse-list"
data-bind="click:function(){displayParentGroupId()}">
- <a href="#">..</a>
+ <li class="browse-list">
+ <a data-bind="click:function(){displayParentGroupId()}" href="#">..
foo</a>
</li>
{{/if}}
{{each(i,browseResultEntry) browseResultEntries}}
