UserNotification: use event's suggestedWindowId if any

#415

src/main/java/de/metas/ui/web/notification/UserNotification.java

@@ -32,11 +32,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
+ * License along with this program. If not, see
  * <http://www.gnu.org/licenses/gpl-2.0.html>.
  * #L%
  */
@@ -68,20 +68,20 @@ public class UserNotification
 	public static enum TargetType
 	{
 		None("none"), Window("window");
-		
+
 		final private String jsonValue;
 
 		TargetType(final String jsonValue)
 		{
 			this.jsonValue = jsonValue;
 		}
-		
+
 		@JsonValue
 		public String getJsonValue()
 		{
 			return jsonValue;
 		}
-		
+
 		public static TargetType forJsonValue(final String jsonValue)
 		{
 			return Stream.of(values())
@@ -118,10 +118,22 @@ private UserNotification(final Event event)
 		if (targetRecord != null)
 		{
 			targetType = TargetType.Window;
-			final RecordZoomWindowFinder recordWindowFinder = RecordZoomWindowFinder.newInstance(targetRecord);
-			target_adWindowId = recordWindowFinder.findAD_Window_ID();
-			target_tableName = recordWindowFinder.getTableName();
-			target_recordId = recordWindowFinder.getRecord_ID();
+
+			final Object suggestedWindowIdObj = event.getProperty(Event.PROPERTY_SuggestedWindowId);
+			final int suggestedWindowId = (suggestedWindowIdObj instanceof Number) ? ((Number)suggestedWindowIdObj).intValue() : -1;
+			if (suggestedWindowId > 0)
+			{
+				target_adWindowId = suggestedWindowId;
+				target_tableName = targetRecord.getTableName();
+				target_recordId = targetRecord.getRecord_ID();
+			}
+			else
+			{
+				final RecordZoomWindowFinder recordWindowFinder = RecordZoomWindowFinder.newInstance(targetRecord);
+				target_adWindowId = recordWindowFinder.findAD_Window_ID();
+				target_tableName = recordWindowFinder.getTableName();
+				target_recordId = recordWindowFinder.getRecord_ID();
+			}
 		}
 		//
 		// Target: none