Changeset 6328


Ignore:
Timestamp:
05/28/11 10:52:34 (11 years ago)
Author:
cfleisch
Message:

#1499 bugfix - filter by name

Location:
branches/WebApplication/MVC2/HLWebOKBQueryPlugin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Models/FilterModel.cs

    r6305 r6328  
    145145        {
    146146            // get selected filter (combobox)
    147             Filter filter = AvailableFilters.Where(x => x.FilterTypeName.Equals(filterTypeName)).FirstOrDefault();
     147            Filter filter = AvailableFilters.Where(x  => x.Label.Equals(filterTypeName)).FirstOrDefault();
    148148
    149149            // find the partent filterr
    150150            List<Filter> orFilters = Content.Filters.ToList<Filter>(); ;
    151151            CombinedFilter parentFilter = (CombinedFilter)orFilters.Where(e => e.Id.Equals(parentId)).FirstOrDefault();
     152
     153           
    152154
    153155            // remove
  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

    r6318 r6328  
    3232        <li>
    3333            <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
    34             <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
     34            <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "Label", "Label"))%>
    3535            <input type="button" name="submitButton" value="+" class="hl-button-text-plus" onclick="setAction('add','<%: currentFilter.Id%>');" />
    3636            <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->
  • branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Index.aspx

    r5910 r6328  
    1313
    1414       <h2>
    15         Hello World Query!</h2>
     15        Query-Plugin main features</h2>
    1616    <p>
    17         <i>Now with more Hello World Action!</i>
     17        <% Html.RenderAction("Menu"); %>
    1818    </p>
    1919
Note: See TracChangeset for help on using the changeset viewer.