metasfresh/metasfresh#1090 FIX NewRecordDescriptorsProvider.getNewRec…

…ordDescriptor
metasfresh · Mar 7, 2017 · 07a0869 · 07a0869
1 parent 79b01aa
commit 07a0869
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/...src/main/java/de/metas/ui/web/window/descriptor/factory/NewRecordDescriptorsProvider.java b/...src/main/java/de/metas/ui/web/window/descriptor/factory/NewRecordDescriptorsProvider.java
@@ -79,15 +79,19 @@ public NewRecordDescriptor getNewRecordDescriptorOrNull(final String tableName)
 		return newRecordDescriptorsByTableName.get(tableName);
 	}
 
+	/**
+	 * @param entityDescriptor the entity descriptor of the quick input window (e.g. for BPartner that is C_BPartner_QuickInput)
+	 * @return new record descriptor
+	 */
 	public NewRecordDescriptor getNewRecordDescriptor(final DocumentEntityDescriptor entityDescriptor)
 	{
-		final String tableName = entityDescriptor.getTableName();
-		final NewRecordDescriptor newRecordDescriptor = getNewRecordDescriptorOrNull(tableName);
-		if (newRecordDescriptor == null)
-		{
-			throw new AdempiereException("No new record quick input defined for " + tableName);
-		}
-		return newRecordDescriptor;
+		final int newRecordWindowId = entityDescriptor.getAD_Window_ID();
+
+		return newRecordDescriptorsByTableName.values()
+				.stream()
+				.filter(descriptor -> newRecordWindowId == descriptor.getNewRecordWindowId())
+				.findFirst()
+				.orElseThrow(() -> new AdempiereException("No new record quick input defined windowId=" + newRecordWindowId));
 	}
 
 	public DocumentEntityDescriptor getNewRecordEntityDescriptorIfAvailable(final String tableName)