Author: olamy
Date: Thu Nov 28 23:13:50 2013
New Revision: 1546472
URL: http://svn.apache.org/r1546472
Log:
[MRM-1769]Can't uploads multiple artifacts of different types send packaging
attribute
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java?rev=1546472&r1=1546471&r2=1546472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
Thu Nov 28 23:13:50 2013
@@ -184,6 +184,11 @@ public class DefaultFileUploadService
File file = new File( SystemUtils.getJavaIoTmpDir(), fileName );
log.debug( "delete file:{},exists:{}", file.getPath(), file.exists() );
boolean removed = getSessionFileMetadatas().remove( new FileMetadata(
fileName ) );
+ // try with full name as ui only know the file name
+ if ( !removed )
+ {
+ removed = getSessionFileMetadatas().remove( new FileMetadata(
file.getPath() ) );
+ }
if ( file.exists() )
{
return file.delete();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js?rev=1546472&r1=1546471&r2=1546472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js
Thu Nov 28 23:13:50 2013
@@ -20,9 +20,10 @@ define("archiva.artifacts-management",["
"knockout.simpleGrid","jquery.validate","bootstrap","jquery.fileupload","jquery.fileupload.ui"]
, function(jquery,i18n,utils,jqueryTmpl,ko) {
- ArtifactUpload=function(classifier,pomFile){
+ ArtifactUpload=function(classifier,pomFile,packaging){
this.classifier=classifier;
this.pomFile=pomFile;
+ this.packaging=packaging;
}
ArtifactUploadViewModel=function(managedRepositories){
@@ -102,19 +103,22 @@ define("archiva.artifacts-management",["
submit: function (e, data) {
var $this = $(this);
$this.fileupload('send', data);
- artifactUploadViewModel.artifactUploads.push(new
ArtifactUpload(data.formData.classifier,data.formData.pomFile));
+ artifactUploadViewModel.artifactUploads.push(new
ArtifactUpload(data.formData.classifier,data.formData.pomFile,data.formData.packaging));
return false;
}
}
);
fileUpload.bind('fileuploadsubmit', function (e, data) {
var pomFile = data.context.find('#pomFile' ).is(":checked");
- var classifier = data.context.find('#classifier' ).val();
+ var classifier = data.context.find('#classifier').val();
+ var packaging = data.context.find('#packaging' ).val();
+ $.log("packaging:"+packaging);
if (!data.formData){
data.formData={};
}
data.formData.pomFile = pomFile;
data.formData.classifier = classifier;
+ data.formData.packaging = packaging;
});
}
});
