svn commit: r1305285 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties archiva-webapp-js/src/main/webapp/js/archiva/search.js

[olamy]

Author: olamy
Date: Mon Mar 26 09:56:59 2012
New Revision: 1305285

URL: http://svn.apache.org/viewvc?rev=1305285&view=rev
Log:
control key/value 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

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=1305285&r1=1305284&r2=1305285&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 Mar 26 09:56:59 2012
@@ -286,6 +286,8 @@ browse.artifact.metadatas.delete=Delete 
 browse.artifact.metadatas.key=Key
 browse.artifact.metadatas.value=Value
 browse.artifact.metadatas.save=Save
+artifact.metadata.key.mandatory=Key is mandatory
+artifact.metadata.value.mandatory=Value is mandatory
 
 
 #login

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=1305285&r1=1305284&r2=1305285&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 Mar 26 09:56:59 2012
@@ -313,6 +313,7 @@ $(function() {
         type: "DELETE",
         dataType: 'json',
         success: function(data) {
+          clearUserMessages();
           displaySuccessMessage( $.i18n.prop("artifact.metadata.deleted"));
           self.entries.remove(entry);
         }
@@ -321,6 +322,16 @@ $(function() {
     }
 
     saveProperty=function(entry){
+      if($.trim(entry.key() ).length<1){
+        clearUserMessages();
+        displayErrorMessage( $.i18n.prop("artifact.metadata.key.mandatory"));
+        return;
+      }
+      if($.trim(entry.value() ).length<1){
+        clearUserMessages();
+        displayErrorMessage( $.i18n.prop("artifact.metadata.value.mandatory"));
+        return;
+      }
       var 
metadatasUrl="restServices/archivaServices/browseService/metadata/"+encodeURIComponent(groupId);
       metadatasUrl+="/"+encodeURIComponent(artifactId);
       metadatasUrl+="/"+encodeURIComponent(version);
@@ -334,6 +345,7 @@ $(function() {
         type: "PUT",
         dataType: 'json',
         success: function(data) {
+          clearUserMessages();
           displaySuccessMessage( $.i18n.prop("artifact.metadata.added"));
           entry.editable(false);
           entry.modified(false);