Changeset 1330 for trunk/src/org/rapla/facade/internal/FacadeImpl.java

Timestamp:

08/14/08 12:01:54 (4 years ago)

Author:

kohlhaas

Message:

closes #56

Files:

• trunk/src/org/rapla/facade/internal/FacadeImpl.java (modified) (2 diffs)

trunk/src/org/rapla/facade/internal/FacadeImpl.java

@@ -481 +481 @@
         }
         removeFilteredClassifications( reservations, filters);
+        
+        //Category can_see = getUserGroupsCategory().getCategory( Permission.GROUP_CAN_READ_EVENTS_FROM_OTHERS);
         Iterator it = reservations.iterator();
+        boolean canSeeOthers =  canReadReservationsFromOthers(user);
         while ( it.hasNext() ) {
             Reservation r = (Reservation) it.next();
-            if ( workingUser == null || r.getOwner().equals( workingUser ) || workingUser.isAdmin())
+            if ( workingUser == null || r.getOwner().equals( workingUser ) || canSeeOthers)
                 continue;
             Allocatable[] allocatables = r.getAllocatables();
@@ -691 +694 @@
             return false;
         }
+    }
+    
+    public boolean canReadReservationsFromOthers(User user) 
+    {
+        if ( user == null)
+        {
+            return workingUser == null || workingUser.isAdmin();
+        }
+        if ( user.isAdmin())
+        {
+            return true;
+        }
+        try {
+            Category can_see = getUserGroupsCategory().getCategory( Permission.GROUP_CAN_READ_EVENTS_FROM_OTHERS);
+            return user.belongsTo( can_see);
+        }
+        catch (Exception ex)
+        {
+            getLogger().error("Can't get permissions!", ex);
+        }
+        return false;
     }