Changeset 7813 for trunk/www/views/itemlists/index.jsp

Timestamp:

May 19, 2020, 2:24:30 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

Merge BASE 3.16.1 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• www/views/itemlists/index.jsp (modified) (2 diffs)

trunk/www/views/itemlists/index.jsp

@@ -229 +229 @@
       Item memberType = Item.valueOf(request.getParameter("memberType"));
       list = ItemList.getNew(dc, memberType);
+      if (Values.getBoolean(request.getParameter("private")))
+      {
+        list.setProjectKey(null);
+        list.setItemKey(null);
+      }
       dc.saveItem(list);
       
@@ -552 +557 @@
     dc.commit();
   } 
+  else if ("AddMembers".equals(cmd))
+  {
+    dc = sc.newDbControl();
+    ItemList list = ItemList.getById(dc, Values.getInt(itemId));
+    String subContext = Values.getString(request.getParameter("subContext"), "");
+    final int maxRecent = Base.getMaxRecent(sc);
+    
+    ItemContext memberContext = sc.getCurrentContext(list.getMemberType(), subContext);
+    memberContext.setRecent(Item.ITEMLIST, list, "AddMembers", maxRecent);
+    ItemQuery<? extends Listable> query = memberContext.getQuery();
+    String source = request.getParameter("source");
+    if ("all".equals(source))
+    {
+      query.setFirstResult(0);
+      query.setMaxResults(-1);
+    }
+    else if ("selected".equals(source))
+    {
+      query.setFirstResult(0);
+      query.setMaxResults(-1);
+      Integer[] itemIds = Values.getInt(request.getParameter("items").split(","));
+      query.restrict(
+        Restrictions.in(
+          Hql.property("id"),
+          Expressions.parameter("selectedItems")
+        )
+      );
+      query.setParameter("selectedItems", Arrays.asList(itemIds), Type.INT);      
+    }
+    // else -- no modifications to the query mean that we only get the current page
+
+    int count = list.add(query.iterate(dc));
+    dc.commit();
+    message = count + " members added to list";
+  }
   else
   {