Fixed defect on priority mappings not being saved when values in conf…

…ig file are incorrect
jaymed · May 19, 2015 · 4107352 · 4107352
1 parent 79afb94
commit 4107352
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/VersionOne.ServiceHost.ConfigurationTool/UI/Controls/JiraPageControl.cs b/VersionOne.ServiceHost.ConfigurationTool/UI/Controls/JiraPageControl.cs
@@ -238,17 +238,19 @@ private void grdProjectMappings_DataError(object sender, DataGridViewDataErrorEv
 
         private void grdPriorityMappings_DataError(object sender, DataGridViewDataErrorEventArgs e)
         {
-            var column = grdPriorityMappings.Columns[e.ColumnIndex];
-
-            if (column == colVersionOnePriority)
-            {
-                SetDefaultValue(VersionOnePriorities, e.RowIndex, e.ColumnIndex);
-            }
-            else if (column == colJiraPriority)
+            if (e.ColumnIndex >= 0)
             {
-                SetDefaultValue(JiraPriorities, e.RowIndex, e.ColumnIndex);
+                var column = grdPriorityMappings.Columns[e.ColumnIndex];
+
+                if (column == colVersionOnePriority)
+                {
+                    SetDefaultValue(VersionOnePriorities, e.RowIndex, e.ColumnIndex);
+                }
+                else if (column == colJiraPriority)
+                {
+                    SetDefaultValue(JiraPriorities, e.RowIndex, e.ColumnIndex);
+                }
             }
-
             e.ThrowException = false;
         }
 
@@ -300,6 +302,14 @@ public void UpdateJiraPriorities(IList<ListValue> priorities)
         {
             JiraPriorities = priorities;
             BindJiraPriorityColumn();
+
+            if (Model.PriorityMappings.Any(priorityMapping => !priorities.Any(
+                p =>
+                    p.Name.Equals(priorityMapping.JiraPriority.Name) &&
+                    p.Value.Equals(priorityMapping.JiraPriority.Id))))
+            {
+                bsPriorityMappings.Clear();
+            }
         }
     }
 }