From 08002b92eb719662d05716bfb9eedb31d5c5501d Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 29 Mar 2012 22:52:20 +0000
Subject: [PATCH] fix form to upload artifacts

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1307152 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/archiva/i18n/default.properties    |  6 +++++
 .../webapp/js/archiva/artifacts-management.js | 12 +++++++--
 .../archiva/artifacts-management.html         | 25 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

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 f6206524b..50bb4cabb 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
@@ -391,5 +391,11 @@ fileupload.errors.acceptFileTypes=Filetype not allowed
 fileupload.errors.maxNumberOfFiles=Max number of files exceeded
 fileupload.errors.uploadedBytes=Uploaded bytes exceed file size
 fileupload.errors.emptyResult=Empty file upload result
+fileupload.artifactId=Artifact ID
+fileupload.groupId=Groupd ID
+fileupload.version=Version
+fileupload.packaging=Packaging
+fileupload.generatePom=Generate Maven POM
+fileupload.repositoryId=Repository Id
 
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
index 41db61d96..d74eb9c71 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
@@ -21,8 +21,16 @@ define("archiva.artifacts-management",["jquery","i18n","order!utils","order!jque
     , function() {
   displayUploadArtifact=function(){
     var mainContent=$("#main-content");
-    mainContent.html($("#file-upload-tmpl" ).tmpl());
-    $('#fileupload').fileupload();
+    mainContent.html(mediumSpinnerImg());
+    $.ajax("restServices/archivaServices/browseService/userRepositories", {
+        type: "GET",
+        dataType: 'json',
+        success: function(data) {
+          mainContent.html($("#file-upload-tmpl" ).tmpl({managedRepositories: data}));
+          $('#fileupload').fileupload();
+        }
+    });
+
   }
 
 });
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
index 7f91fdeaa..f79bbecd3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
@@ -6,6 +6,16 @@
         enctype="multipart/form-data" class="well form-horizontal">
 
     <fieldset id="network-proxy-edit-fieldset">
+      <div class="control-group">
+        <label class="control-label" for="repositoryId">${$.i18n.prop('fileupload.repositoryId')}</label>
+        <div class="controls">
+          <select id="repositoryId" name="repositoryId">
+            {{each(i,repository) managedRepositories}}
+              <option value="${repository.id}">${repository.name}</option>
+            {{/each}}
+          </select>
+         </div>
+        </div>
       <div class="control-group">
         <label class="control-label" for="groupId">${$.i18n.prop('fileupload.groupId')}</label>
         <div class="controls">
@@ -27,6 +37,20 @@
           </div>
         </div>
       </div>
+      <div class="control-group">
+        <label class="control-label" for="artifactId">${$.i18n.prop('fileupload.packaging')}</label>
+        <div class="controls">
+          <input type="text" class="xlarge required" id="packaging" name="packaging" size="10" />
+          </div>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="generatePom">${$.i18n.prop('fileupload.generatePom')}</label>
+        <div class="controls">
+          <input type="checkbox" class="xlarge required" id="generatePom" name="generatePom" />
+          </div>
+        </div>
+      </div>
     </fieldset>
 
     <div class="row fileupload-buttonbar">
@@ -70,6 +94,7 @@
   {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload">
       <td class="name"><span>{%=file.name%}</span></td>
+      <td><input type="text" placeholder="classifier"></td>
       <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
       {% if (file.error) { %}
       <td class="error" colspan="2">
-- 
2.39.5