Ignore:
Timestamp:
Dec 10, 2018, 8:43:53 AM (3 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #2133: Formatting of sync filter

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.13-stable/www/views/itemlists/view_list.jsp

    r7166 r7546  
    113113  %>
    114114  <base:page title="<%=title%>" id="view-page">
    115   <base:head scripts="table.js,tabcontrol-2.js,~lists.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">
     115  <base:head scripts="table.js,tabcontrol-2.js,~lists.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css,~syncfilter/filtertext.css">
    116116    <ext:scripts context="<%=jspContext%>" />
    117117    <ext:stylesheets context="<%=jspContext%>" />
     
    431431            <%
    432432            int index = 0;
    433             Formatter<PropertyFilter> filterFormatter = new PropertyFilterFormatter(dc, dateFormatter);
     433            Formatter<PropertyFilter> filterFormatter = new PropertyFilterFormatter(dc, dateFormatter, true);
    434434            for (SyncFilter sf : syncFilters)
    435435            {
     
    442442              for (int filterRow = 0; filterRow < sf.getFilterRows(); filterRow++)
    443443              {
    444                 sb.append(filterRow > 0 ? "\nOR " : "");
     444                sb.append(filterRow > 0 ? "\n<operator>OR</operator> " : "");
    445445                List<String> filters = SyncFilter.getFormattedAndSortedFilters(sf.getPropertyFilters(filterRow), filterFormatter);
    446                 sb.append(Values.getString(filters, "\n   AND ", true));
     446                sb.append(Values.getString(filters, "\n   <operator>AND</operator> ", true));
    447447              }
    448448              boolean disabled = sf.isDisabled();
     
    516516                  }
    517517                  %>
    518                   <pre id="syncfilter.<%=filterId%>"><%=HTML.encodeTags(sb.toString())%></pre></tbl:cell>
     518                  <pre class="filtertext" id="syncfilter.<%=filterId%>"><%=HTML.encodeTags(sb.toString(), "value|name|operator|function")%></pre></tbl:cell>
    519519                <tbl:cell column="inSync">
    520520                  <base:icon
Note: See TracChangeset for help on using the changeset viewer.