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 2014/01/30 23:51:48 UTC
svn commit: r1563009 - in
/archiva/branches/2.0.0-RC/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva-webapp/src/main/webapp/js/redback/users.js
Author: olamy
Date: Thu Jan 30 22:51:47 2014
New Revision: 1563009
URL: http://svn.apache.org/r1563009
Log:
fix button label and apply a better solution for filtering
Modified:
archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
Modified: archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1563009&r1=1563008&r2=1563009&view=diff
==============================================================================
--- archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Thu Jan 30 22:51:47 2014
@@ -266,7 +266,7 @@ users.grid.filter.locked=Locked
users.grid.filter.not.locked=Not Locked
users.grid.filter.pwd.change.required=Password Change required
users.grid.filter.pwd.change.not.required=Password Change not required
-users.grid.filter=Filter
+users.grid.filter=Clear filter
#roles management
roles.management.header=Roles Management
Modified: archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js?rev=1563009&r1=1563008&r2=1563009&view=diff
==============================================================================
--- archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js (original)
+++ archiva/branches/2.0.0-RC/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js Thu Jan 30 22:51:47 2014
@@ -25,6 +25,7 @@ function(jquery,utils,i18n,jqueryValidat
UsersViewModel=function() {
var self = this;
this.users = ko.observableArray([]);
+
this.originalUsers=ko.observableArray([]);
this.gridViewModel = new ko.simpleGrid.viewModel({
@@ -49,13 +50,12 @@ function(jquery,utils,i18n,jqueryValidat
],
pageSize: 10,
gridUpdateCallBack: function(){
- $.log("gridUpdateCallBack users result");
+ $.log("gridUpdateCallBack users result");
applyAutocompleteOnUsersHeaders(self);
}
});
clearFilters=function(){
self.users(self.originalUsers());
-
};
filterLocked=function(){
var founds=[];
@@ -282,7 +282,7 @@ function(jquery,utils,i18n,jqueryValidat
applyAutocompleteOnHeaderUsers=function(property,usersViewModel){
var founds=[];
- $(usersViewModel.users()).each(function(idx,user){
+ $(usersViewModel.originalUsers()).each(function(idx,user){
if(user[property] && user[property]()){
founds.push(user[property]());
}
@@ -295,7 +295,7 @@ function(jquery,utils,i18n,jqueryValidat
$("#main-content").find("#users-grid-filter-auto-"+property ).on('typeahead:selected', function(obj, datum) {
var users=[];
- $(usersViewModel.users()).each(function(idx,user){
+ $(usersViewModel.originalUsers()).each(function(idx,user){
if(user[property] && user[property]() && user[property]().indexOf(datum.value)>=0){
users.push(user);
}