From: Olivier Lamy <olamy@apache.org>
Date: Fri, 28 Sep 2012 13:32:26 +0000 (+0000)
Subject: if applicationUrl defined it was not used in repository group screen
X-Git-Tag: archiva-1.4-M3~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a7bf4c10b2577e1e1a3f0862109dfe28c81fcbe;p=archiva.git

if applicationUrl defined it was not used in repository group screen

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
index 651671cfd..7477df057 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
@@ -45,6 +45,7 @@ function() {
     this.update=update;
     this.repositoryGroupsViewModel=repositoryGroupsViewModel;
     this.availableRepositories=ko.observableArray([]);
+    this.applicationUrl=null;
 
     for (var i=0;i<repositoryGroupsViewModel.managedRepositories().length;i++){
       if ( $.inArray(repositoryGroupsViewModel.managedRepositories()[i].id(),this.repositoryGroup.repositories())<0){
@@ -78,6 +79,7 @@ function() {
     var self=this;
     this.repositoryGroups=ko.observableArray([]);
     this.managedRepositories=ko.observableArray([]);
+    this.applicationUrl="";
 
     this.findManagedRepository=function(id){
       return findManagedRepository(id,self.managedRepositories());
@@ -108,11 +110,21 @@ function() {
     }
 
     this.editRepositoryGroup=function(repositoryGroup){
-      $.log("editRepositoryGroup:"+repositoryGroup.id()+",repositories:"+repositoryGroup.repositories().length+",managed:"+repositoryGroup.managedRepositories().length);
-      var repositoryGroupViewModel=new RepositoryGroupViewModel(repositoryGroup,true,self);
-      activateRepositoryGroupEditTab();
-      ko.applyBindings(repositoryGroupViewModel,$("#main-content").find("#repository-groups-edit" ).get(0));
-      $("#main-content" ).find("#repository-groups-view-tabs-li-edit" ).find("a").html($.i18n.prop("edit"));
+
+
+      $.ajax({
+          url: "restServices/archivaServices/archivaAdministrationService/applicationUrl",
+          type: "GET",
+          dataType: 'text',
+          success: function(applicationUrl){
+            $.log("editRepositoryGroup:"+repositoryGroup.id()+",repositories:"+repositoryGroup.repositories().length+",managed:"+repositoryGroup.managedRepositories().length);
+            var repositoryGroupViewModel=new RepositoryGroupViewModel(repositoryGroup,true,self);
+            repositoryGroupViewModel.applicationUrl=applicationUrl;
+            activateRepositoryGroupEditTab();
+            ko.applyBindings(repositoryGroupViewModel,$("#main-content").find("#repository-groups-edit" ).get(0));
+            $("#main-content" ).find("#repository-groups-view-tabs-li-edit" ).find("a").html($.i18n.prop("edit"));
+          }
+        });
     }
 
     this.saveRepositoryGroup=function(repositoryGroup){
@@ -185,7 +197,7 @@ function() {
           success: function(applicationUrl){
 
             self.repositoryGroupsViewModel.managedRepositories(mapManagedRepositories(data,applicationUrl));
-
+            self.repositoryGroupsViewModel.applicationUrl=applicationUrl;
             $.ajax("restServices/archivaServices/repositoryGroupService/getRepositoriesGroups", {
                 type: "GET",
                 dataType: 'json',
@@ -200,7 +212,7 @@ function() {
                   mainContent.html($("#repositoryGroupsMain").tmpl());
                   self.repositoryGroupsViewModel.repositoryGroups(mappedRepositoryGroups);
                   $.log("displayRepositoryGroups#applyBindings before");
-                  ko.applyBindings(repositoryGroupsViewModel,mainContent.find("#repository-groups-view" ).get(0));
+                  ko.applyBindings(self.repositoryGroupsViewModel,mainContent.find("#repository-groups-view" ).get(0));
                   $.log("displayRepositoryGroups#applyBindings after");
 
 
@@ -208,6 +220,7 @@ function() {
                     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));
                     }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index a18ea7b3a..74e7d383e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -1146,7 +1146,7 @@
         ${repositoryGroup.id}
         <br/>
         <a href="${window.archivaRuntimeInfo.baseUrl}/repository/${repositoryGroup.id()}" target="_blank">
-          ${window.archivaRuntimeInfo.baseUrl}/repository/${repositoryGroup.id()}
+          ${applicationUrl}/repository/${repositoryGroup.id()}
         </a>
       </blockquote>
     </div>