Changeset 7740

Timestamp:

Aug 28, 2019, 2:35:37 PM (2 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2190: Problems with the "Remember current filter for future re-sync" option when creating an item list

The option is now hidden if there is no active filter.

Location:

branches/3.15-stable/www/views/itemlists

Files:

• edit_list.jsp (modified) (2 diffs)
• index.jsp (modified) (1 diff)
• lists.js (modified) (1 diff)

branches/3.15-stable/www/views/itemlists/edit_list.jsp

@@ -66 +66 @@
   Item memberType = addItems ? Item.valueOf(request.getParameter("memberType")) : null;
   String formId = addItems ? Values.getStringOrNull(request.getParameter("formId")) : null;
-  String subContext = addItems ? Values.getStringOrNull(request.getParameter("subContext")) : null;
-
+  String subContext = Values.getString(request.getParameter("subContext"), "");
+  
+  ItemContext filterContext = addItems && memberType != null ? sc.getCurrentContext(memberType, subContext) : null;
+  boolean hasSourceFilter = filterContext != null && filterContext.getNumPropertyFilters() > 0;
+  
   ItemQuery<ItemSubtype> subtypesQuery = null;
   boolean readCurrentSubtype = true;
@@ -252 +255 @@
             <input type="radio" name="source" id="sourceAll" value="all" checked
               ><label for="sourceAll">All pages</label><br>
-              <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;"
-                ><label for="syncFilter">Remember current filter for future re-sync</label>
+              <%
+              if (hasSourceFilter) 
+              {
+                %>
+                <input type="checkbox" name="syncFilter" id="syncFilter" value="1" checked style="margin-left:2em;"
+                  ><label for="syncFilter">Remember current filter for future re-sync</label>
+                <%
+              }
+              %>
           </td>
           <td></td>

branches/3.15-stable/www/views/itemlists/index.jsp

@@ -283 +283 @@
           if ("all".equals(source))
           {
-            useSyncFilter = Values.getBoolean(request.getParameter("syncFilter"));
+            useSyncFilter = Values.getBoolean(request.getParameter("syncFilter")) && filterContext.getNumPropertyFilters() > 0;
             query.setFirstResult(0);
             query.setMaxResults(-1);

branches/3.15-stable/www/views/itemlists/lists.js

@@ -265 +265 @@
   {
     var frm = document.forms['list'];
-    frm.syncFilter.disabled = !Doc.element('sourceAll').checked;
+    if (frm.syncFilter) frm.syncFilter.disabled = !Doc.element('sourceAll').checked;
   }