Author: olamy
Date: Thu Oct 18 03:16:53 2012
New Revision: 1399507
URL: http://svn.apache.org/viewvc?rev=1399507&view=rev
Log:
[MRM-862] Paginate Dependencies Page.
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/knockout.simpleGrid.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=1399507&r1=1399506&r2=1399507&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
Thu Oct 18 03:16:53 2012
@@ -340,6 +340,18 @@ define("archiva.search",["jquery","i18n"
dataType: 'json',
success: function(data) {
self.projectVersionMetadata=mapProjectVersionMetadata(data);
+
+ //pagination for dependencies
+
self.projectVersionMetadata.dependencies=ko.observableArray(self.projectVersionMetadata.dependencies?self.projectVersionMetadata.dependencies:[]);
+ self.gridViewModel = new ko.simpleGrid.viewModel({
+ data: self.projectVersionMetadata.dependencies(),
+ columns: [],
+ pageSize: 7,
+ gridUpdateCallBack: function(){
+ // nope
+ }
+ });
+
ko.applyBindings(self,mainContent.find("#browse_artifact_detail"
).get(0));
ko.applyBindings(self,mainContent.find("#browse_breadcrumb"
).get(0));
mainContent.find("#browse-autocomplete" ).hide();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js?rev=1399507&r1=1399506&r2=1399507&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
Thu Oct 18 03:16:53 2012
@@ -43,6 +43,7 @@
};
this.gridUpdateCallBack = configuration.gridUpdateCallBack;
this.pageLinksUpdateCallBack = configuration.pageLinksUpdateCallBack;
+
}
};
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=1399507&r1=1399506&r2=1399507&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
Thu Oct 18 03:16:53 2012
@@ -626,41 +626,10 @@
<div id="artifact-details-dependencies-content" class="tab-pane">
- <table class="table">
- <tbody>
- {{if projectVersionMetadata.dependencies &&
projectVersionMetadata.dependencies.length>0}}
- {{each(i,dependency) projectVersionMetadata.dependencies}}
- <tr>
- <th>${dependency.artifactId}</th>
- </tr>
- <tr>
- <td>
- {{var entries=dependency.crumbEntries()}}
- {{each(j,crumbEntry) entries}}
- {{if j < entries.length - 2}}
- <a href="#" data-bind="click:
function(){displayGroup(crumbEntry.groupId)}">${crumbEntry.displayValue}</a>
- {{else j == entries.length - 2}}
- <a href="#" data-bind="click:
function(){displayArtifactDetailView(crumbEntry.groupId,crumbEntry.artifactId)}">${crumbEntry.displayValue}</a>
- {{else j == entries.length - 1}}
-
| <b>${$.i18n.prop('browse.artifact.version')}:</b>
- <a href="#" data-bind="click:
function(){displayArtifactVersionDetailViewModel(crumbEntry.groupId,crumbEntry.artifactId,crumbEntry.version)}">${dependency.version}</a>
- {{/if}}
- {{if j < entries.length - 2}}
- /
- {{/if}}
- {{/each}}
-
- {{if dependency.scope}}
-
| <b>${$.i18n.prop('browse.artifact.scope')}:</b> ${dependency.scope}
- {{/if}}
- </td>
- </tr>
- {{/each}}
- {{else}}
- ${$.i18n.prop('browse.artifact.dependencies.none')}
- {{/if}}
- </tbody>
- </table>
+ <table class="table table-striped table-bordered"
id="artifact-dependencies-table"
+ data-bind="simpleGrid:
gridViewModel,simpleGridTemplate:'ko_dependenciesGrid',pageLinksId:'dependenciesPagination',data:'dependencies'">
+ </table>
+ <div id="dependenciesPagination"></div>
</div>
<div id="artifact-details-dependency-tree-content"
class="tab-pane"></div>
@@ -737,6 +706,42 @@
</div>
</div>
+ </div>
+</script>
+
+<script id="ko_dependenciesGrid" type="text/html">
+ <tbody>
+
+
+ {{each(i, row) itemsOnCurrentPage()}}
+ <tr>
+ <th>${row.artifactId}</th>
+ </tr>
+ <tr>
+ <td>
+ {{var entries=row.crumbEntries()}}
+ {{each(j,crumbEntry) entries}}
+ {{if j < entries.length - 2}}
+ <a href="#" data-bind="click:
function(){displayGroup(crumbEntry.groupId)}">${crumbEntry.displayValue}</a>
+ {{else j == entries.length - 2}}
+ <a href="#" data-bind="click:
function(){displayArtifactDetailView(crumbEntry.groupId,crumbEntry.artifactId)}">${crumbEntry.displayValue}</a>
+ {{else j == entries.length - 1}}
+
| <b>${$.i18n.prop('browse.artifact.version')}:</b>
+ <a href="#" data-bind="click:
function(){displayArtifactVersionDetailViewModel(crumbEntry.groupId,crumbEntry.artifactId,crumbEntry.version)}">${row.version}</a>
+ {{/if}}
+ {{if j < entries.length - 2}}
+ /
+ {{/if}}
+ {{/each}}
+
+ {{if row.scope}}
+
| <b>${$.i18n.prop('browse.artifact.scope')}:</b> ${row.scope}
+ {{/if}}
+ </td>
+ </tr>
+ {{/each}}
+
+ </tbody>
</script>
<script id="dependency_tree_tmpl" type="text/html">