From 93e22f06f647ac99b39bb00ca77188be0a265451 Mon Sep 17 00:00:00 2001 From: skygo Date: Sat, 1 Jun 2013 15:14:50 +0000 Subject: [PATCH] manual patch js file to cope with trunk https://svn.apache.org/viewvc?view=revision&sortby=log&revision=1481952 git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-1756@1488533 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/admin/repository/maven2/repository-groups.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js index 6af71b002..eef015ed0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js @@ -20,7 +20,7 @@ define("archiva/admin/repository/maven2/repository-groups",["jquery","i18n","jqu ,"knockout.simpleGrid","knockout.sortable","archiva/admin/repository/maven2/repositories"], function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,jqueryUi,ko) { - RepositoryGroup=function(id,repositories,mergedIndexPath){ + RepositoryGroup=function(id,repositories,mergedIndexPath,mergedIndexTtl){ var self=this; @@ -32,6 +32,10 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,jqueryUi,ko) { this.mergedIndexPath=ko.observable(mergedIndexPath?mergedIndexPath:".indexer"); this.mergedIndexPath.subscribe(function(newValue){self.modified(true)}); + // private int mergedIndexTtl = 30; + this.mergedIndexTtl=ko.observable(mergedIndexTtl?mergedIndexTtl:30); + this.mergedIndexTtl.subscribe(function(newValue){self.modified(true)}); + // private List repositories; this.repositories=ko.observableArray(repositories); this.repositories.subscribe(function(newValue){self.modified(true)}); @@ -414,7 +418,7 @@ function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,jqueryUi,ko) { } mapRepositoryGroup=function(data){ - return new RepositoryGroup(data.id, mapStringArray(data.repositories),data.mergedIndexPath); + return new RepositoryGroup(data.id, mapStringArray(data.repositories),data.mergedIndexPath,data.mergedIndexTtl); } }); -- 2.39.5