Fixed an issue with Cascading parameter matching and the parameter va…

…lue not existing yet to match on.
alanjuden · Jun 12, 2017 · fa24c95 · fa24c95
1 parent 08af23a
commit fa24c95
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/AlanJuden.MvcReportViewer.NetCore/ReportServiceHelpers.cs b/AlanJuden.MvcReportViewer.NetCore/ReportServiceHelpers.cs
@@ -82,17 +82,20 @@ public static ReportService.ReportParameter[] GetReportParameters(ReportViewerMo
 				var tempParameters = new List<ReportService.ParameterValue>();
 				foreach (var parameter in parameters)
 				{
-					var providedParameter = model.Parameters[parameter.Name];
-					if (providedParameter != null)
+					if (model.Parameters.ContainsKey(parameter.Name))
 					{
-						foreach (var value in providedParameter.Where(x => !String.IsNullOrEmpty(x)))
+						var providedParameter = model.Parameters[parameter.Name];
+						if (providedParameter != null)
 						{
-							tempParameters.Add(new ReportService.ParameterValue()
+							foreach (var value in providedParameter.Where(x => !String.IsNullOrEmpty(x)))
 							{
-								Label = parameter.Name,
-								Name = parameter.Name,
-								Value = value
-							});
+								tempParameters.Add(new ReportService.ParameterValue()
+								{
+									Label = parameter.Name,
+									Name = parameter.Name,
+									Value = value
+								});
+							}
 						}
 					}
 				}

diff --git a/AlanJuden.MvcReportViewer/ReportServiceHelpers.cs b/AlanJuden.MvcReportViewer/ReportServiceHelpers.cs
@@ -48,17 +48,20 @@ public static ReportService.ReportParameter[] GetReportParameters(ReportViewerMo
 				var tempParameters = new List<ReportService.ParameterValue>();
 				foreach (var parameter in parameters)
 				{
-					var providedParameter = model.Parameters[parameter.Name];
-					if (providedParameter != null)
+					if (model.Parameters.ContainsKey(parameter.Name))
 					{
-						foreach (var value in providedParameter.Where(x => !String.IsNullOrEmpty(x)))
+						var providedParameter = model.Parameters[parameter.Name];
+						if (providedParameter != null)
 						{
-							tempParameters.Add(new ReportService.ParameterValue()
+							foreach (var value in providedParameter.Where(x => !String.IsNullOrEmpty(x)))
 							{
-								Label = parameter.Name,
-								Name = parameter.Name,
-								Value = value
-							});
+								tempParameters.Add(new ReportService.ParameterValue()
+								{
+									Label = parameter.Name,
+									Name = parameter.Name,
+									Value = value
+								});
+							}
 						}
 					}
 				}