From: Olivier Lamy <olamy@apache.org>
Date: Mon, 10 Sep 2012 22:14:00 +0000 (+0000)
Subject: validate repository is selectionned before adding metadata
X-Git-Tag: archiva-1.4-M3~256
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=502730007671d473c2123c4099abc45250642ea9;p=archiva.git

validate repository is selectionned before adding metadata

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1383126 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 a317d1826..599d11506 100644
--- 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
@@ -307,6 +307,7 @@ browse.artifact.metadatas.save=Save
 artifact.metadata.key.mandatory=Key is mandatory
 artifact.metadata.value.mandatory=Value is mandatory
 browse.artifact.content.header=File Content
+repository.selected.missing=You must select a groupId
 
 
 #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 ed4b5dfe4..b85f83758 100644
--- 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
@@ -464,9 +464,15 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
       metadatasUrl+="/"+encodeURIComponent(version);
       metadatasUrl+="/"+encodeURIComponent(entry.key());
       var selectedRepo=getSelectedBrowsingRepository();
-      if (selectedRepo){
-        metadatasUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
+
+      if(!selectedRepo){
+        clearUserMessages();
+        displayErrorMessage($.i18n.prop('repository.selected.missing'));
+        return;
       }
+
+      metadatasUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
+
       $.ajax(metadatasUrl, {
         type: "DELETE",
         dataType: 'json',
@@ -498,12 +504,21 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
         displayErrorMessage( $.i18n.prop("artifact.metadata.value.mandatory"));
         return;
       }
+
+      var selectedRepo=getSelectedBrowsingRepository();
+
+      if(!selectedRepo){
+        clearUserMessages();
+        displayErrorMessage($.i18n.prop('repository.selected.missing'));
+        return;
+      }
+
       var metadatasUrl="restServices/archivaServices/browseService/metadata/"+encodeURIComponent(groupId);
       metadatasUrl+="/"+encodeURIComponent(artifactId);
       metadatasUrl+="/"+encodeURIComponent(version);
       metadatasUrl+="/"+encodeURIComponent(entry.key());
       metadatasUrl+="/"+encodeURIComponent(entry.value());
-      var selectedRepo=getSelectedBrowsingRepository();
+
       if (selectedRepo){
         metadatasUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
       }