Changeset 3448

Timestamp:

Jun 5, 2007, 9:34:56 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

 

Location:

branches/2.3.1

Files:

• src/core/net/sf/basedb/core/Project.java (modified) (6 diffs)
• www/my_base/projects/items/list_items.jsp (modified) (5 diffs)
• www/my_base/projects/set_active.jsp (modified) (2 diffs)

branches/2.3.1/src/core/net/sf/basedb/core/Project.java

@@ -33 +33 @@
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -345 +346 @@
 
   /**
+     @deprecated Use {@link #getItems(Item, int, int, Permission, Set)} instead
+  */
+  public ResultList<Shareable> getItems(Item itemType, int firstItem, int maxItems, Permission permission)
+  {
+    return getItems(itemType, firstItem, maxItems, permission, null);
+  }
+  
+  
+  /**
     Load the items in a project. If this project is the active project it will load
     all items in the project. If this project isn't the active project it will
@@ -353 +363 @@
     @param firstItem The index of the first item to return (0-based)
     @param maxItems The maximum number of items to return, or 0 to return all items
+    @param permissions The permission the logged in user must have on the item
+    @param include Options for which items that should be included/excluded from the
+      result, or null to include all non-removed items
     @return A list containing shareable items
     @see SessionControl#setActiveProject(Project)
   */
-  public ResultList<Shareable> getItems(Item itemType, int firstItem, int maxItems, Permission permission)
-  {
+  public ResultList<Shareable> getItems(Item itemType, int firstItem, int maxItems, 
+    Permission permission, Set<Include> include)
+  {
+    if (include == null) include = EnumSet.of(Include.NOT_REMOVED, Include.MINE, Include.OTHERS);
+    
     DbControl dc = getDbControl();
     SessionControl sc = dc.getSessionControl();
@@ -376 +392 @@
       projectKeys = new HashSet<Integer>(HibernateUtil.loadList(Integer.class, query));
       
-      // Enable 'ownedBy' filter since this is not the active project
-      org.hibernate.Filter ownerFilter = HibernateUtil.enableFilter(session, "ownedBy");
-      ownerFilter.setParameter("owner", sc.getLoggedInUserId());
+      include.remove(Include.OTHERS);
     }
     else
@@ -409 +423 @@
     keyFilter.setParameter("owner", sc.getLoggedInUserId());
     
+    // Add filters for 'removed' option
+    if (!(include.contains(Include.REMOVED) && include.contains(Include.NOT_REMOVED)))
+    {
+      org.hibernate.Filter removedFilter = HibernateUtil.enableFilter(session, "isRemoved");
+      removedFilter.setParameter("removed", include.contains(Include.REMOVED));
+    }
+    // Add filter for 'owned by me' and 'owned by others' options
+    if (include.contains(Include.MINE) && include.contains(Include.OTHERS))
+    {
+      // Do nothing; all items are included
+    }
+    else if (include.contains(Include.MINE))
+    {
+      org.hibernate.Filter ownerFilter = HibernateUtil.enableFilter(session, "ownedBy");
+      ownerFilter.setParameter("owner", sc.getLoggedInUserId());
+    }
+    else if (include.contains(Include.OTHERS))
+    {
+      org.hibernate.Filter otherFilter = HibernateUtil.enableFilter(session, "notOwnedBy");
+      otherFilter.setParameter("owner", sc.getLoggedInUserId());      
+    }
+    else
+    {
+      org.hibernate.Filter denyAllFilter = HibernateUtil.enableFilter(session, "denyAll");
+    }
+    
     // Query to load all shareable items
     org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_SHARED_ITEMS");
@@ -422 +462 @@
     HibernateUtil.disableFilter(session, "inProject");
     HibernateUtil.disableFilter(session, "ownedBy");
+    HibernateUtil.disableFilter(session, "notOwnedBy");
+    HibernateUtil.disableFilter(session, "isRemoved");
+    HibernateUtil.disableFilter(session, "denyAll");
     
     Class<? extends BasicData> dataClass = itemType == null ? null : itemType.getDataClass();

branches/2.3.1/www/my_base/projects/items/list_items.jsp

@@ -69 +69 @@
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, subContext, null, null);
 final int projectId = Values.getInt(request.getParameter("project_id"));
+final int activeProjectId = sc.getActiveProjectId();
 final DbControl dc = sc.newDbControl();
 ResultList<Shareable> items = null;
@@ -78 +79 @@
   {
     items = project.getItems(filterItem == null ? null : Item.valueOf(filterItem), 
-      cc.getPage() * cc.getRowsPerPage(), cc.getRowsPerPage(), cc.getItemPermission());
+      cc.getPage() * cc.getRowsPerPage(), cc.getRowsPerPage(), cc.getItemPermission(),
+      cc.getInclude());
   }
   catch (Throwable t)
@@ -147 +149 @@
       Table.presetOnChange('<%=ID%>', formId, '<%=itemType.name()%>', '<%=(String)cc.getObject("defaultColumns")%>', '<%=subContext%>');
     }
+    function setToActive()
+    {
+      Main.openPopup('../set_active.jsp?ID=<%=ID%>&project_id=<%=projectId%>', 'ActivateProject', 300, 140);
+    }
     function switchTab(tabControlId, tabId)
     {
@@ -253 +259 @@
         />
       </tbl:toolbar>
+      <%
+      if (projectId != activeProjectId)
+      {
+        %>
+        <tbl:panel>
+          <div class="error" onclick="setToActive()" style="cursor: pointer;"
+            title="Click to make this project the active project">
+          This project is not the active project. The list can't display items 
+          that are owned by other members of the project.
+          </div>
+        </tbl:panel>
+        <%
+      }
+      %>
       <tbl:navigator
         page="<%=cc.getPage()%>" 
@@ -264 +284 @@
             colspan="3"
             onchange="presetOnChange()"
+            disablesharedto="true"
+            disableothers="<%=projectId != activeProjectId%>"
           />
         </tbl:columns>

branches/2.3.1/www/my_base/projects/set_active.jsp

@@ -28 +28 @@
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.Project"
+  import="net.sf.basedb.core.Include"
+  import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.util.Values"
@@ -48 +51 @@
 {
   Project p = null;
-  if (projectId != 0) p = Project.getById(dc, projectId);
+  ItemContext allItems = sc.getCurrentContext(Item.PROJECT, "items");
+  allItems.getInclude().add(Include.MINE);
+  if (projectId != 0) 
+  {
+    p = Project.getById(dc, projectId);
+    allItems.getInclude().add(Include.OTHERS);
+  }
   sc.setActiveProject(p);
   sc.setUserClientSetting("projects.lastactive", projectId == 0 ? null : Integer.toString(projectId));