control key/value not empty

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305285 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 d37fa25f3baf8f18e0becc15d4a16da78b5eaa64..00070192aa1e079aaa81abf0dab12a22b5ff5ea0 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
@@ -286,6 +286,8 @@ browse.artifact.metadatas.delete=Delete Property
 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

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 8c0b9f5fc4c2dea5a1d79ebee7083da48a29288b..b3faebc6ad5c9a965968d06f5da0db6a884a7d48 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
@@ -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);