From 1af394618d7f66c1e6333432541e60d07ca7e233 Mon Sep 17 00:00:00 2001 From: skygo Date: Wed, 13 Mar 2013 10:42:32 +0000 Subject: [PATCH] MRM-1748 -use is(":checked") because attr("checked") was always returning not set. -adapt defaultfileupload boolean conversion to handle "1" as true value. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1455874 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/web/api/DefaultFileUploadService.java | 4 ++-- .../src/main/webapp/js/archiva/artifacts-management.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 6e6da12b5..a30bc6d2f 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -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" diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js index 9a571355d..213ea43bf 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js @@ -107,7 +107,7 @@ define("archiva.artifacts-management",["jquery","i18n","utils","jquery.tmpl","kn } ); 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={}; -- 2.39.5