Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC2B69EAD for ; Sun, 23 Sep 2012 23:23:30 +0000 (UTC) Received: (qmail 36228 invoked by uid 500); 23 Sep 2012 23:23:30 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 36196 invoked by uid 500); 23 Sep 2012 23:23:30 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 36189 invoked by uid 99); 23 Sep 2012 23:23:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Sep 2012 23:23:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Sep 2012 23:23:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E61692388ABB for ; Sun, 23 Sep 2012 23:22:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1389170 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/search.js templates/archiva/search.html Date: Sun, 23 Sep 2012 23:22:43 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120923232243.E61692388ABB@eris.apache.org> Author: olamy Date: Sun Sep 23 23:22:43 2012 New Revision: 1389170 URL: http://svn.apache.org/viewvc?rev=1389170&view=rev Log: rss link when browsing an artifact Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1389170&r1=1389169&r2=1389170&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Sun Sep 23 23:22:43 2012 @@ -23,12 +23,13 @@ define("archiva.search",["jquery","i18n" // browse part //----------------------------------------- - BrowseViewModel=function(browseResultEntries,parentBrowseViewModel,groupId,repositoryId){ + BrowseViewModel=function(browseResultEntries,parentBrowseViewModel,groupId,repositoryId,feedsUrl){ var self=this; this.browseResultEntries=browseResultEntries; this.parentBrowseViewModel=parentBrowseViewModel; this.groupId=groupId; this.repositoryId=repositoryId; + this.feedsUrl=feedsUrl; displayGroupId=function(groupId){ $.log("BrowseViewModel#displayGroupId,self.repositoryId:"+self.repositoryId); if(self.repositoryId){ @@ -143,7 +144,7 @@ define("archiva.search",["jquery","i18n" return breadCrumbEntries; } - displayGroupDetail=function(groupId,parentBrowseViewModel,restUrl,repositoryId){ + displayGroupDetail=function(groupId,parentBrowseViewModel,restUrl,repositoryId,feedsUrl){ var mainContent = $("#main-content"); mainContent.find("#browse_artifact_detail").hide(); var browseResult=mainContent.find("#browse_result"); @@ -171,7 +172,7 @@ define("archiva.search",["jquery","i18n" dataType: 'json', success: function(data) { var browseResultEntries = mapBrowseResultEntries(data); - var browseViewModel = new BrowseViewModel(browseResultEntries,parentBrowseViewModel,groupId,repositoryId); + var browseViewModel = new BrowseViewModel(browseResultEntries,parentBrowseViewModel,groupId,repositoryId,feedsUrl); ko.applyBindings(browseViewModel,browseBreadCrumb.get(0)); ko.applyBindings(browseViewModel,browseResult.get(0)); enableAutocompleBrowse(groupId); @@ -799,17 +800,19 @@ define("archiva.search",["jquery","i18n" mainContent.find("#browse_result").html(mediumSpinnerImg()); var parentBrowseViewModel=new BrowseViewModel(null,null,null,repositoryId); var url="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId); + var feedsUrl=applicationUrl?applicationUrl:window.location.toString().substringBeforeLast("/").substringBeforeLast("/"); if (repositoryId){ url+="?repositoryId="+repositoryId; // we are browsing a groupId so 2 substringBeforeLast - var feedsUrl=applicationUrl?applicationUrl:window.location.toString().substringBeforeLast("/").substringBeforeLast("/"); + feedsUrl+="/feeds/"+repositoryId; mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ) .tmpl({repositories:data,selected:repositoryId,feedsUrl:feedsUrl})); }else{ - mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ).tmpl({repositories:data,selected:""})); + mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ) + .tmpl({repositories:data,selected:"",feedsUrl:null})); } - displayGroupDetail(groupId,parentBrowseViewModel,url,repositoryId); + displayGroupDetail(groupId,parentBrowseViewModel,url,repositoryId,feedsUrl); } }); Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1389170&r1=1389169&r2=1389170&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html Sun Sep 23 23:22:43 2012 @@ -42,6 +42,7 @@