Changeset 6328 for branches/WebApplication

Timestamp:

05/28/11 10:52:34 (14 years ago)

Author:

cfleisch

Message:

#1499 bugfix - filter by name

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• Models/FilterModel.cs (modified) (1 diff)
• Views/Filter/Filters.ascx (modified) (1 diff)
• Views/Query/Index.aspx (modified) (1 diff)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Models/FilterModel.cs

@@ -145 +145 @@
         {
             // get selected filter (combobox)
-            Filter filter = AvailableFilters.Where(x => x.FilterTypeName.Equals(filterTypeName)).FirstOrDefault();
+            Filter filter = AvailableFilters.Where(x  => x.Label.Equals(filterTypeName)).FirstOrDefault();
 
             // find the partent filterr
             List<Filter> orFilters = Content.Filters.ToList<Filter>(); ;
             CombinedFilter parentFilter = (CombinedFilter)orFilters.Where(e => e.Id.Equals(parentId)).FirstOrDefault();
+
+            
 
             // remove

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

@@ -32 +32 @@
         <li>
             <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
-            <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
+            <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "Label", "Label"))%>
             <input type="button" name="submitButton" value="+" class="hl-button-text-plus" onclick="setAction('add','<%: currentFilter.Id%>');" />
             <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Index.aspx

@@ -13 +13 @@
 
        <h2>
-        Hello World Query!</h2>
+        Query-Plugin main features</h2>
     <p>
-        <i>Now with more Hello World Action!</i>
+        <% Html.RenderAction("Menu"); %>
     </p>