From b06d4e210fe08c7535244c5a95357b5953e4fd84 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 18 Oct 2012 11:44:51 +0000 Subject: [PATCH] [MRM-863] Paginate Used By tab git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1399591 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main.js | 23 +++++-- .../webapp/js/templates/archiva/search.html | 62 ++++++++++--------- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index 57590873d..2d84a910d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -507,8 +507,8 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa var calculateUsedBy=function(groupId,artifactId,version){ var dependeesContentDiv=$("#main-content" ).find("#artifact-details-used-by-content" ); - if( $.trim(dependeesContentDiv.html()).length<1){ - dependeesContentDiv.html(mediumSpinnerImg()); + //if( $.trim(dependeesContentDiv.html()).length<1){ + dependeesContentDiv.append(mediumSpinnerImg()); var dependeesUrl="restServices/archivaServices/browseService/dependees/"+encodeURIComponent(groupId); dependeesUrl+="/"+encodeURIComponent(artifactId); dependeesUrl+="/"+encodeURIComponent(version); @@ -521,10 +521,25 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa dataType: 'json', success: function(data) { var artifacts=mapArtifacts(data); - dependeesContentDiv.html($("#dependees_tmpl").tmpl({artifacts: artifacts})); + //dependeesContentDiv.html($("#dependees_tmpl").tmpl({artifacts: artifacts})); + var gridViewModel = new ko.simpleGrid.viewModel({ + data: artifacts, + columns: [], + pageSize: 2, + gridUpdateCallBack: function(){ + // no op + } + }); + $.log("artifacts:"+artifacts.length); + dependeesContentDiv.find("#artifact-usedby-table").attr("data-bind", + "simpleGrid: gridViewModel,simpleGridTemplate:'dependees_tmpl',pageLinksId:'usedbyPagination',data:'artifacts'"); + ko.applyBindings({artifacts:artifacts,gridViewModel:gridViewModel},dependeesContentDiv.get(0)); + }, + complete: function(){ + removeMediumSpinnerImg(("#artifact-details-used-by-content")); } }); - } + //} }; this.get('#artifact-used-by/:groupId/:artifactId/:version',function(context){ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html index fb0493cdc..076d8ca60 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html @@ -638,7 +638,11 @@
-
+
+ +
+
+
{{if projectVersionMetadata.mailingLists && projectVersionMetadata.mailingLists.length>0}} @@ -713,33 +717,33 @@ - {{each(i, row) itemsOnCurrentPage()}} - - ${row.artifactId} - - - - {{var entries=row.crumbEntries()}} - {{each(j,crumbEntry) entries}} - {{if j < entries.length - 2}} - ${crumbEntry.displayValue} - {{else j == entries.length - 2}} - ${crumbEntry.displayValue} - {{else j == entries.length - 1}} -  | ${$.i18n.prop('browse.artifact.version')}:  - ${row.version}  - {{/if}} - {{if j < entries.length - 2}} -  /  - {{/if}} - {{/each}} + {{each(i, row) itemsOnCurrentPage()}} + + ${row.artifactId} + + + + {{var entries=row.crumbEntries()}} + {{each(j,crumbEntry) entries}} + {{if j < entries.length - 2}} + ${crumbEntry.displayValue} + {{else j == entries.length - 2}} + ${crumbEntry.displayValue} + {{else j == entries.length - 1}} +  | ${$.i18n.prop('browse.artifact.version')}:  + ${row.version}  + {{/if}} + {{if j < entries.length - 2}} +  /  + {{/if}} + {{/each}} - {{if row.scope}} - | ${$.i18n.prop('browse.artifact.scope')}: ${row.scope} - {{/if}} - - - {{/each}} + {{if row.scope}} + | ${$.i18n.prop('browse.artifact.scope')}: ${row.scope} + {{/if}} + + + {{/each}} @@ -771,8 +775,10 @@