Author: olamy
Date: Sat Mar 31 15:35:52 2012
New Revision: 1307831
URL: http://svn.apache.org/viewvc?rev=1307831&view=rev
Log:
cleanup service to delete uploaded files, add form validation before starting
upload
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java?rev=1307831&r1=1307830&r2=1307831&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java
Sat Mar 31 15:35:52 2012
@@ -190,7 +190,7 @@ public class DefaultFileUploadService
public Boolean clearUploadedFiles()
throws ArchivaRestServiceException
{
- List<FileMetadata> fileMetadatas = getSessionFileMetadatas();
+ List<FileMetadata> fileMetadatas = new ArrayList(
getSessionFileMetadatas() );
for ( FileMetadata fileMetadata : fileMetadatas )
{
deleteFile( fileMetadata.getServerFileName() );
@@ -222,13 +222,7 @@ public class DefaultFileUploadService
{
public boolean apply( FileMetadata fileMetadata )
{
- if ( fileMetadata == null )
- {
- return false;
- }
- return StringUtils.equals( groupId, fileMetadata.getGroupId()
) && StringUtils.equals( artifactId,
-
fileMetadata.getArtifactId() )
- && !fileMetadata.isPomFile();
+ return fileMetadata != null && !fileMetadata.isPomFile();
}
} );
Iterator<FileMetadata> iterator = filesToAdd.iterator();
@@ -245,7 +239,7 @@ public class DefaultFileUploadService
{
public boolean apply( @Nullable FileMetadata fileMetadata )
{
- return fileMetadata.isPomFile();
+ return fileMetadata != null && fileMetadata.isPomFile();
}
} );
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=1307831&r1=1307830&r2=1307831&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
Sat Mar 31 15:35:52 2012
@@ -90,6 +90,9 @@ define("archiva.artifacts-management",["
});
$('#fileupload').fileupload({
add: function (e, data) {
+ if(!mainContent.find("#fileupload" ).valid()){
+ return;
+ }
data.formData = {
groupId: artifactUploadViewModel.groupId(),
artifactId: artifactUploadViewModel.artifactId(),
