validate query terms are not empty

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1294225 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b2bbef78f6fe154f5818cdc7b6f0a33c16aceaf7..f0c7bd8a412e5491d54fc80009e2816d81c443b5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -215,4 +215,5 @@ search.artifact.search.form.query.className=Class Name
 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.

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index 5a5dd3f54425fede00f68cd2e601a92f97fd2c6b..eb13285671fe3131d998aeb21e3bdfebfab5e553 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -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(){

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index 55bdbc638b5173f0ec21942bcd1d438817e2ab68..c98c62b8bbdfaafba2599a6cf563eb8b41adee06 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -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}}