svn commit: r1455874 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js

[skygo]

Author: skygo
Date: Wed Mar 13 10:42:32 2013
New Revision: 1455874

URL: http://svn.apache.org/r1455874
Log:
MRM-1748
-use is(":checked") because attr("checked") was always returning not set.
-adapt defaultfileupload boolean conversion to handle "1" as true value.

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=1455874&r1=1455873&r2=1455874&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
 Wed Mar 13 10:42:32 2013
@@ -125,8 +125,8 @@ public class DefaultFileUploadService
         {
 
             String classifier = getStringValue( multipartBody, "classifier" );
-            boolean pomFile = BooleanUtils.toBoolean( getStringValue( 
multipartBody, "pomFile" ) );
-
+            boolean pomFile = BooleanUtils.toBoolean( getStringValue( 
multipartBody, "pomFile" ), "1", "" );
+            
             Attachment file = multipartBody.getAttachment( "files[]" );
 
             //Content-Disposition: form-data; name="files[]"; 
filename="org.apache.karaf.features.command-2.2.2.jar"

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=1455874&r1=1455873&r2=1455874&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
 Wed Mar 13 10:42:32 2013
@@ -107,7 +107,7 @@ define("archiva.artifacts-management",["
                   }
                 );
                 fileUpload.bind('fileuploadsubmit', function (e, data) {
-                  var pomFile = data.context.find('#pomFile' ).attr("checked");
+                  var pomFile = data.context.find('#pomFile' ).is(":checked");
                   var classifier = data.context.find('#classifier' ).val();
                   if (!data.formData){
                     data.formData={};