Merge pull request #88 from proteomexchange/bulkSubmissionFix

2.4.16
PRIDE-Archive · May 12, 2020 · 15e0567 · 15e0567
2 parents 1d5d230 + 449b294
commit 15e0567
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ PX Submission Tool is a desktop application to submit the data to proteomeXchang
 
 # Quick Download 
 
-[<img src="https://raw.githubusercontent.com/PRIDE-Toolsuite/pride-inspector/master/wiki/download.png">](https://github.com/proteomexchange/px-submission-tool/releases/download/px-submission-tool-2.4.15/px-submission-tool.zip)
+[<img src="https://raw.githubusercontent.com/PRIDE-Toolsuite/pride-inspector/master/wiki/download.png">](https://github.com/proteomexchange/px-submission-tool/releases/download/px-submission-tool-2.4.16/px-submission-tool.zip)
 
 Please unzip and run `px-submission-tool-<version number>.jar` file!
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>uk.ac.ebi.pride.px</groupId>
     <artifactId>px-submission-tool</artifactId>
     <packaging>jar</packaging>
-    <version>2.4.15</version>
+    <version>2.4.16</version>
     <name>px-submission-tool</name>
     <url>https://github.com/proteomexchange/px-submission-tool</url>
 
@@ -50,12 +50,12 @@
         <uk.ac.ebi.pride.architectural.pride-tdd.version>1.0.3</uk.ac.ebi.pride.architectural.pride-tdd.version>
         <assembly.dir>${project.name}-${project.version}</assembly.dir>
         <project.output.dir>target/classes</project.output.dir>
-        <uk.ac.ebi.pride.archive-archive-data-provider-api.version>2.0.11</uk.ac.ebi.pride.archive-archive-data-provider-api.version>
+        <uk.ac.ebi.pride.archive-archive-data-provider-api.version>2.0.12</uk.ac.ebi.pride.archive-archive-data-provider-api.version>
         <uk.ac.ebi.pride.web-pride-web-utils.version>1.3.13</uk.ac.ebi.pride.web-pride-web-utils.version>
         <uk.ac.ebi.pride.jaxb-pride-jaxb.version>1.0.18</uk.ac.ebi.pride.jaxb-pride-jaxb.version>
         <uk.ac.ebi.pride.utilities-pride-utilities.version>2.0.16</uk.ac.ebi.pride.utilities-pride-utilities.version>
         <uk.ac.ebi.pride.toolsuite-inspector-swing-utils.version>2.0.3</uk.ac.ebi.pride.toolsuite-inspector-swing-utils.version>
-        <uk.ac.ebi.pride-px-submission-core.version>2.0.28</uk.ac.ebi.pride-px-submission-core.version>
+        <uk.ac.ebi.pride-px-submission-core.version>2.0.29</uk.ac.ebi.pride-px-submission-core.version>
         <uk.ac.ebi.pride.px-libpxreport.version>1.1</uk.ac.ebi.pride.px-libpxreport.version>
         <uk.ac.ebi.pride.toolsuite-ols-dialog.version>3.4.16</uk.ac.ebi.pride.toolsuite-ols-dialog.version>
         <uk.ac.ebi.jmzidml-jmzidentml.version>1.2.6</uk.ac.ebi.jmzidml-jmzidentml.version>

diff --git a/src/main/java/uk/ac/ebi/pride/gui/form/action/LoadSubmissionFileAction.java b/src/main/java/uk/ac/ebi/pride/gui/form/action/LoadSubmissionFileAction.java
@@ -271,9 +271,12 @@ protected Void doInBackground() throws Exception {
             SubmissionRecord submissionRecord = new SubmissionRecord(submission);
 
             AppContext ctx = (AppContext) App.getInstance().getDesktopContext();
+            SubmissionRecord contextSubmissionRecord = ctx.getSubmissionRecord();
             submissionRecord.getSubmission().getProjectMetaData()
-                    .setSubmitterContact(ctx.getSubmissionRecord().getSubmission().getProjectMetaData()
+                    .setSubmitterContact(contextSubmissionRecord.getSubmission().getProjectMetaData()
                             .getSubmitterContact());
+            submissionRecord.setUserName(contextSubmissionRecord.getUserName());
+            submissionRecord.setPassword(contextSubmissionRecord.getPassword());
             ctx.setSubmissionRecord(submissionRecord);
             ctx.setBulkMode(true);