Author: olamy
Date: Tue Sep 25 21:17:24 2012
New Revision: 1390147
URL: http://svn.apache.org/viewvc?rev=1390147&view=rev
Log:
fix url display in repository groups definition page
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1390147&r1=1390146&r2=1390147&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Tue Sep 25 21:17:24 2012
@@ -34,7 +34,7 @@ define("archiva.repositories",["jquery",
ManagedRepository=function(id,name,layout,indexDirectory,location,snapshots,releases,blockRedeployments,cronExpression,
scanned,daysOlder,retentionCount,deleteReleasedSnapshots,stageRepoNeeded,description,
- skipPackedIndexCreation,feedsUrl){
+ skipPackedIndexCreation,feedsUrl,url){
var self=this;
@@ -105,6 +105,8 @@ define("archiva.repositories",["jquery",
this.feedsUrl=feedsUrl;
+ this.url=url;
+
this.getTypeLabel=function(){
for(var i=0;i<window.managedRepositoryTypes.length;i++){
if (window.managedRepositoryTypes[i].type==self.layout()){
@@ -154,6 +156,7 @@ define("archiva.repositories",["jquery",
var mappedManagedRepositories = $.map(data, function(item) {
var managedRepository = mapManagedRepository(item);
managedRepository.feedsUrl=applicationUrl+"/feeds/"+managedRepository.id();
+
managedRepository.url=applicationUrl+"/repository/"+managedRepository.id()
return managedRepository;
});
return mappedManagedRepositories;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1390147&r1=1390146&r2=1390147&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
Tue Sep 25 21:17:24 2012
@@ -177,44 +177,53 @@ function() {
var self=this;
loadManagedRepositories(function(data) {
-
self.repositoryGroupsViewModel.managedRepositories(mapManagedRepositories(data));
-
$.ajax("restServices/archivaServices/repositoryGroupService/getRepositoriesGroups",
{
+ $.ajax({
+ url:
"restServices/archivaServices/archivaAdministrationService/applicationUrl",
type: "GET",
- dataType: 'json',
- success: function(data) {
- var mappedRepositoryGroups=mapRepositoryGroups(data);
- for(var i=0;i<mappedRepositoryGroups.length;i++){
- mappedRepositoryGroups[i]
-
.managedRepositories(self.mapManagedRepositoriesToRepositoryGroup(mappedRepositoryGroups[i]));
- mappedRepositoryGroups[i].modified(false);
-
$.log("mappedRepositoryGroups.repositories().length:"+mappedRepositoryGroups[i].repositories().length);
- }
- mainContent.html($("#repositoryGroupsMain").tmpl());
-
self.repositoryGroupsViewModel.repositoryGroups(mappedRepositoryGroups);
- $.log("displayRepositoryGroups#applyBindings before");
-
ko.applyBindings(repositoryGroupsViewModel,mainContent.find("#repository-groups-view"
).get(0));
- $.log("displayRepositoryGroups#applyBindings after");
-
-
- mainContent.find("#repository-groups-view-tabs").on('show',
function (e) {
- if ($(e.target).attr("href")=="#repository-groups-edit") {
- var repositoryGroup = new RepositoryGroup();
- var repositoryGroupViewModel=new
RepositoryGroupViewModel(repositoryGroup,false,self.repositoryGroupsViewModel);
- activateRepositoryGroupEditTab();
-
ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-edit"
).get(0));
- }
- if ($(e.target).attr("href")=="#repository-groups-view") {
- mainContent.find("#repository-groups-view-tabs-li-edit
a").html($.i18n.prop("add"));
- clearUserMessages();
- }
+ dataType: 'text',
+ success: function(applicationUrl){
- });
+
self.repositoryGroupsViewModel.managedRepositories(mapManagedRepositories(data,applicationUrl));
- }
- }
- );
+
$.ajax("restServices/archivaServices/repositoryGroupService/getRepositoriesGroups",
{
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var mappedRepositoryGroups=mapRepositoryGroups(data);
+ for(var i=0;i<mappedRepositoryGroups.length;i++){
+ mappedRepositoryGroups[i]
+
.managedRepositories(self.mapManagedRepositoriesToRepositoryGroup(mappedRepositoryGroups[i]));
+ mappedRepositoryGroups[i].modified(false);
+
$.log("mappedRepositoryGroups.repositories().length:"+mappedRepositoryGroups[i].repositories().length);
+ }
+ mainContent.html($("#repositoryGroupsMain").tmpl());
+
self.repositoryGroupsViewModel.repositoryGroups(mappedRepositoryGroups);
+ $.log("displayRepositoryGroups#applyBindings before");
+
ko.applyBindings(repositoryGroupsViewModel,mainContent.find("#repository-groups-view"
).get(0));
+ $.log("displayRepositoryGroups#applyBindings after");
+
+
+ mainContent.find("#repository-groups-view-tabs").on('show',
function (e) {
+ if ($(e.target).attr("href")=="#repository-groups-edit") {
+ var repositoryGroup = new RepositoryGroup();
+ var repositoryGroupViewModel=new
RepositoryGroupViewModel(repositoryGroup,false,self.repositoryGroupsViewModel);
+ activateRepositoryGroupEditTab();
+
ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-edit"
).get(0));
+ }
+ if ($(e.target).attr("href")=="#repository-groups-view") {
+ mainContent.find("#repository-groups-view-tabs-li-edit
a").html($.i18n.prop("add"));
+ clearUserMessages();
+ }
+
+ });
+ }
+ }
+ );
+
+ }
+ });
});
this.mapManagedRepositoriesToRepositoryGroup=function(repositoryGroup){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1390147&r1=1390146&r2=1390147&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Tue Sep 25 21:17:24 2012
@@ -1181,8 +1181,8 @@
<br/>
${$data.name()}
<br/>
- <a href="${window.archivaRuntimeInfo.baseUrl}/repository/${$data.id()}"
target="_blank">
- ${window.archivaRuntimeInfo.baseUrl}/repository/${$data.id()}
+ <a href="${$data.url}" target="_blank">
+ ${$data.url}
</a>
<br/>
</blockquote>
