Author: olamy
Date: Thu Mar 29 22:52:20 2012
New Revision: 1307152
URL: http://svn.apache.org/viewvc?rev=1307152&view=rev
Log:
fix form to upload artifacts
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/artifacts-management.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
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=1307152&r1=1307151&r2=1307152&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
Thu Mar 29 22:52:20 2012
@@ -391,5 +391,11 @@ fileupload.errors.acceptFileTypes=Filety
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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js?rev=1307152&r1=1307151&r2=1307152&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
Thu Mar 29 22:52:20 2012
@@ -21,8 +21,16 @@ define("archiva.artifacts-management",["
, 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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html?rev=1307152&r1=1307151&r2=1307152&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
Thu Mar 29 22:52:20 2012
@@ -7,6 +7,16 @@
<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">
<input type="text" class="xlarge required" id="groupId"
name="groupId" size="10" />
@@ -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">
