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/02/27 17:58:38 UTC
svn commit: r1294225 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/archiva/templates/
Author: olamy
Date: Mon Feb 27 16:58:37 2012
New Revision: 1294225
URL: http://svn.apache.org/viewvc?rev=1294225&view=rev
Log:
validate query terms are not empty
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-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
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=1294225&r1=1294224&r2=1294225&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 Mon Feb 27 16:58:37 2012
@@ -215,4 +215,5 @@ search.artifact.search.form.query.classN
search.artifact.search.form.query.repositories=Repositories
search.artifact.search.form.advanced=Advanced Parameters
search.artifact.search.form.query.artifactId=Artifact ID
-
+search.artifact.search.form.repositories.all=All
+search.artifact.search.form.terms.empty=You must enter some search terms.
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=1294225&r1=1294224&r2=1294225&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 Mon Feb 27 16:58:37 2012
@@ -551,8 +551,20 @@ $(function() {
this.selectedRepoIds=[];
basicSearch=function(){
- $.log("query:"+this.searchParameters().basicQueryString());
- $.log("repoIds:"+this.selectedRepoIds);
+ //$.log("query:"+this.searchParameters().basicQueryString());
+ //$.log("repoIds:"+this.selectedRepoIds);
+ var queryTerm=this.searchParameters().basicQueryString();
+ if (!queryTerm || $.trim(queryTerm).length<1){
+ $.log("empty");
+ var errorList=[{
+ message: $.i18n.prop("search.artifact.search.form.terms.empty"),
+ element: $("#main-content #search-basic-form #search-terms" ).get(0)
+ }];
+ customShowError("#main-content #search-basic-form", null, null, errorList);
+ } else {
+ // cleanup previours error message
+ customShowError("#main-content #search-basic-form", null, null, []);
+ }
}
advancedSearch=function(){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1294225&r1=1294224&r2=1294225&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Mon Feb 27 16:58:37 2012
@@ -187,7 +187,7 @@
<select data-placeholder="${$.i18n.prop('search.artifact.search.form.query.repositories')}"
id="search-basic-repostories-select" class="chzn-select"
multiple style="width:350px;" tabindex="4">
- <option value="">All</option>
+ <option value="all">${$.i18n.prop('search.artifact.search.form.repositories.all')}</option>
{{each(i,repoId) observableRepoIds}}
<option value="${repoId}">${repoId}</option>
{{/each}}