Author: olamy
Date: Thu Oct 18 11:44:51 2012
New Revision: 1399591
URL: http://svn.apache.org/viewvc?rev=1399591&view=rev
Log:
[MRM-863] Paginate Used By tab
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.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/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1399591&r1=1399590&r2=1399591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Thu Oct 18 11:44:51 2012
@@ -507,8 +507,8 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
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,jquer
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){
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=1399591&r1=1399590&r2=1399591&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 11:44:51 2012
@@ -638,7 +638,11 @@
<div id="artifact-details-download-content" class="tab-pane"></div>
- <div id="artifact-details-used-by-content" class="tab-pane"></div>
+ <div id="artifact-details-used-by-content" class="tab-pane">
+ <table class="table table-striped table-bordered"
id="artifact-usedby-table">
+ </table>
+ <div id="usedbyPagination"></div>
+ </div>
<div id="artifact-details-mailing-list-content" class="tab-pane">
{{if projectVersionMetadata.mailingLists &&
projectVersionMetadata.mailingLists.length>0}}
@@ -713,33 +717,33 @@
<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}}
+ {{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}}
+ {{if row.scope}}
+
| <b>${$.i18n.prop('browse.artifact.scope')}:</b> ${row.scope}
+ {{/if}}
+ </td>
+ </tr>
+ {{/each}}
</tbody>
</script>
@@ -771,8 +775,10 @@
</script>
<script id="dependees_tmpl" type="text/html">
+ fooo
<ul>
- {{each(i,artifact) artifacts}}
+ {{each(i, artifact) itemsOnCurrentPage()}}
+
<li>
{{var entries=artifact.crumbEntries()}}
{{each(j,crumbEntry) entries}}
