Author: olamy
Date: Wed Jan 15 03:29:47 2014
New Revision: 1558283
URL: http://svn.apache.org/r1558283
Log:
use typeahead for users filtering
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js
(contents, props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1558283&r1=1558282&r2=1558283&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Wed Jan 15 03:29:47 2014
@@ -702,5 +702,8 @@ welcome.docref=Documentation reference
welcome.mainsite=Archiva Web site
+version.delete.missing.repoId=You must select a Repository
+
+
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js?rev=1558283&r1=1558282&r2=1558283&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
Wed Jan 15 03:29:47 2014
@@ -1455,7 +1455,7 @@ define("archiva.search",["jquery","jquer
return;
}
var dotEnd=request.term.endsWith(".");
- // org.apache. requets with org.apache
+ // org.apache. request with org.apache
// org.apa request with org before last dot and filter response with
startsWith
if (request.term.indexOf(".")>=0){
if (dotEnd){
@@ -1520,12 +1520,15 @@ define("archiva.search",["jquery","jquer
}
return false;
}
- }).data( "autocomplete" )._renderItem = function( ul, item ) {
+ })
+ ._renderItem = function( ul, item ) {
+ $.log("_renderItem");
return $( "<li></li>" )
.data( "item.autocomplete",
item )
.append( groupId ? "<a>" +
item.name.substring(groupId.length+1, item.name.length) + "</a>": "<a>" +
item.name + "</a>" )
.appendTo( ul );
};
+
}
/**
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js?rev=1558283&r1=1558282&r2=1558283&view=diff
==============================================================================
(empty)
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js
('svn:executable' removed)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js?rev=1558283&r1=1558282&r2=1558283&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js
Wed Jan 15 03:29:47 2014
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback.users",["jquery","jquery.ui","utils","i18n","jquery.validate","knockout","knockout.simpleGrid","typeahead"],
-function(jquery,jqueryui,utils,i18n,jqueryValidate,ko,koSimpleGrid,typeahead) {
+define("redback.users",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid","typeahead"],
+function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,typeahead) {
/**
* view model used for users grid
@@ -281,57 +281,15 @@ function(jquery,jqueryui,utils,i18n,jque
}
applyAutocompleteOnHeaderUsers=function(property,usersViewModel){
-
- $("#main-content").find("#users-grid-filter-auto-"+property
).autocomplete({
- minLength: 0,
- source: function(request, response){
- var founds=[];
- $.log("source:"+request.term+",users:"+usersViewModel.users().length)
- $(usersViewModel.users()).each(function(idx,user){
- if(user[property] && user[property]() &&
user[property]().indexOf(request.term)>=0){
- founds.push(user[property]());
- }
- });
- response(unifyArray(founds,true));
- },
- select: function( event, ui ) {
- $.log("property:"+property+','+ui.item.value);
- var users=[];
- $(usersViewModel.users()).each(function(idx,user){
- if(user[property] && user[property]() &&
user[property]().indexOf(ui.item.value)>=0){
- users.push(user);
- }
- });
- $.log("property:"+property+','+ui.item.value+",size:"+users.length);
- usersViewModel.users(users);
- return false;
- }
- });
-
- /*
- olamy: doesn't work????
- var values=[];
+ var founds=[];
$(usersViewModel.users()).each(function(idx,user){
- var value=user[property];
- if(value!=null && $.inArray(value, values)<0){
- values.push(value);
+ if(user[property] && user[property]()){
+ founds.push(user[property]());
}
});
- var jid = "#users-grid-filter-auto-"+property;
- $.log("applyAutocompleteOnHeaderUsers:"+values.length+" for " + jid);
-
- var box = $("#main-content").find(jid);
-
- box.typeahead( { local: values } );
- box.bind('typeahead:selected', function(obj, datum, name) {
- var users=[];
- $(usersViewModel.users()).each(function(idx,user){
- if(user[property] && user[property]() &&
user[property]().indexOf(datum.value)>=0){
- users.push(user);
- }
- });
- usersViewModel.users(users);
- });*/
+ $("#main-content").find("#users-grid-filter-auto-"+property ).typeahead({
+ local: founds
+ });
}
/**
