Changeset 6245 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers

Timestamp:

05/21/11 16:13:05 (14 years ago)

Author:

dhohl

Message:

#1499 Filter controls save the correct Comparison. Filter Label is correct.

File:

• branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers/FilterController.cs (modified) (5 diffs)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers/FilterController.cs

@@ -57 +57 @@
 
             // Add Filter
-
             String idKey = null;
             String parentIdKey = null;
@@ -77 +76 @@
             fm.AddFilter(filterTypeName, parentId);
 
-
-
-
-
+            UpdateModel(collection, fm);
+
+            // Set Content
+            Session["Content"] = fm.Content;
+
+            return View("Index", fm);
+        }
+
+        private void UpdateModel(FormCollection collection, FilterModel fm)
+        {
             // Iterate "posted" values and build up a dictionary for
             // each filter (id).
             // <id>     =>      <key> => <value>
             //          =>      <key> => <value>
+            Dictionary<Guid, Dictionary<string, string>> postValues = CreatePostValueMap(collection);
+
+            // Update filters with posted data
+            fm.UpdateWithPostValues(postValues);
+        }
+
+
+        // Iterate "posted" values and build up a dictionary for
+        // each filter (id).
+        // <id>     =>      <key> => <value>
+        //          =>      <key> => <value>
+        private Dictionary<Guid, Dictionary<string, string>> CreatePostValueMap(FormCollection collection)
+        {
             Dictionary<Guid, Dictionary<string, string>> postValues = new Dictionary<Guid, Dictionary<string, string>>();
 
@@ -111 +129 @@
                 }
             }
-
-            // Update filters with posted data
-            fm.UpdateWithPostValues(postValues);
-
-
-            // Set Content
-            Session["Content"] = fm.Content;
-
-
-
-            return View("Index", fm);
+            return postValues;
         }
 
@@ -139 +147 @@
             // Remove Filter
             bool filterRemoved = fm.RemoveFilter(id);
+
+            // TODO Model muss auch beim löschen upgeadatet werden UpdateModel(collection, fm);
 
             // Set Content
@@ -163 +173 @@
             fm.Content.Filters = orFilters.ToArray<Filter>();
 
+            // TODO Model muss auch beim löschen upgeadatet werden UpdateModel(collection, fm);
 
             Session["Content"] = fm.Content;