You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/14 23:33:57 UTC
svn commit: r1231597 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/repositories.js archiva/templates/repositories.html redback/roles.js
Author: olamy
Date: Sat Jan 14 22:33:56 2012
New Revision: 1231597
URL: http://svn.apache.org/viewvc?rev=1231597&view=rev
Log:
fix managedrepositories grid view
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1231597&r1=1231596&r2=1231597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Sat Jan 14 22:33:56 2012
@@ -23,48 +23,48 @@ $(function() {
//private String id;
- id=ko.observable(id);
+ this.id=ko.observable(id);
//private String name;
- name=ko.observable(name);
+ this.name=ko.observable(name);
//private String layout = "default";
- layout=ko.observable(layout);
+ this.layout=ko.observable(layout);
//private String indexDirectory;
- indexDirectory=ko.observable(indexDirectory);
+ this.indexDirectory=ko.observable(indexDirectory);
//private String location;
- location=ko.observable(location);
+ this.location=ko.observable(location);
//private boolean snapshots = false;
- snapshots=ko.observable(snapshots);
+ this.snapshots=ko.observable(snapshots);
//private boolean releases = true;
- releases=ko.observable(releases);
+ this.releases=ko.observable(releases);
//private boolean blockRedeployments = false;
- blockRedeployments=ko.observable(blockRedeployments);
+ this.blockRedeployments=ko.observable(blockRedeployments);
//private String cronExpression = "0 0 * * * ?";
- cronExpression=ko.observable(cronExpression);
+ this.cronExpression=ko.observable(cronExpression);
//private ManagedRepository stagingRepository;
//private boolean scanned = false;
- scanned=ko.observable(scanned);
+ this.scanned=ko.observable(scanned);
//private int daysOlder = 100;
- daysOlder=ko.observable(daysOlder);
+ this.daysOlder=ko.observable(daysOlder);
//private int retentionCount = 2;
- retentionCount=ko.observable(retentionCount);
+ this.retentionCount=ko.observable(retentionCount);
//private boolean deleteReleasedSnapshots;
- deleteReleasedSnapshots=ko.observable(deleteReleasedSnapshots);
+ this.deleteReleasedSnapshots=ko.observable(deleteReleasedSnapshots);
//private boolean stageRepoNeeded;
- stageRepoNeeded=ko.observable(stageRepoNeeded);
+ this.stageRepoNeeded=ko.observable(stageRepoNeeded);
}
ManagedRepositoriesViewModel=function(){
@@ -72,6 +72,10 @@ $(function() {
this.gridViewModel = null;
+ editManagedRepository=function(managedRepository){
+ $.log(managedRepository.name());
+ }
+
}
@@ -84,16 +88,17 @@ $(function() {
$("#main-content #managed-repositories-content").append(mediumSpinnerImg());
$("#main-content #remote-repositories-content").append(mediumSpinnerImg());
- var viewModel = new ManagedRepositoriesViewModel();
+
$.ajax("restServices/archivaServices/managedRepositoriesService/getManagedRepositories", {
type: "GET",
dataType: 'json',
success: function(data) {
- var mappedManagedRepositories = mapManagedRepositories(data);
- viewModel.managedRepositories=ko.observableArray(mappedManagedRepositories);
- viewModel.gridViewModel = new ko.simpleGrid.viewModel({
- data: viewModel.managedRepositories,
+
+ var managedRepositoriesViewModel = new ManagedRepositoriesViewModel();
+ managedRepositoriesViewModel.managedRepositories(mapManagedRepositories(data));
+ managedRepositoriesViewModel.gridViewModel = new ko.simpleGrid.viewModel({
+ data: managedRepositoriesViewModel.managedRepositories,
columns: [
{
headerText: $.i18n.prop('identifier'),
@@ -102,11 +107,15 @@ $(function() {
{
headerText: $.i18n.prop('name'),
rowText: "name"
+ },
+ {
+ headerText: $.i18n.prop('type'),
+ rowText: "layout"
}
],
pageSize: 10
});
- ko.applyBindings(viewModel,$("#main-content #managed-repositories-view").get(0));
+ ko.applyBindings(managedRepositoriesViewModel,$("#main-content #managed-repositories-table").get(0));
$("#main-content #managed-repositories-pills").pills();
$("#managed-repositories-view").addClass("active");
removeMediumSpinnerImg("#main-content #managed-repositories-content");
@@ -118,10 +127,10 @@ $(function() {
}
mapManagedRepositories=function(data){
- return $.map(data.managedRepository, function(item) {
+ var mappedManagedRepositories = $.map(data.managedRepository, function(item) {
return mapManagedRepository(item);
});
-
+ return mappedManagedRepositories;
}
mapManagedRepository=function(data){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1231597&r1=1231596&r2=1231597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html Sat Jan 14 22:33:56 2012
@@ -63,6 +63,8 @@
{{each(i, columnDefinition) columns}}
<th>${ columnDefinition.headerText }</th>
{{/each}}
+ <th>${$.i18n.prop('release.included')}</th>
+ <th>${$.i18n.prop('snapshots.included')}</th>
<th>${$.i18n.prop('edit')}</th>
</tr>
@@ -70,10 +72,26 @@
<tbody>
{{each(i, row) itemsOnCurrentPage()}}
<tr>
- {{each(j, columnDefinition) columns}}
+ {{each(j, columnDefinition) columns}}
<td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
- {{/each}}
- <td><a href="#" data-bind="click: function(){ alert(row.name) }">Edit</a></td>
+ {{/each}}
+ <td>
+ {{if row.releases() == true}}
+ <img src="images/weather-clear.png"/>
+ {{else}}
+ <img src="images/dialog-error.png"/>
+ {{/if}}
+ </td>
+
+ <td>
+ {{if row.snapshots() == true}}
+ <img src="images/weather-clear.png"/>
+ {{else}}
+ <img src="images/dialog-error.png"/>
+ {{/if}}
+ </td>
+
+ <td><a href="#" data-bind="click: function(){ editManagedRepository(row) }">Edit</a></td>
</tr>
{{/each}}
</tbody>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1231597&r1=1231596&r2=1231597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js Sat Jan 14 22:33:56 2012
@@ -139,8 +139,6 @@ $(function() {
}
-
-
displayRolesGrid = function(){
screenChange();
$("#main-content").html(mediumSpinnerImg());
@@ -148,7 +146,7 @@ $(function() {
window.redbackModel.rolesViewModel.loadRoles();
$("#main-content").html($("#rolesTabs").tmpl());
ko.applyBindings(window.redbackModel.rolesViewModel,jQuery("#main-content").get(0));
- $("#roles-view-tabs").pills();
+ $("#main-content #roles-view-tabs").pills();
activateRolesGridTab();
removeMediumSpinnerImg();
}