Changeset 1330 for trunk

Timestamp:

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

Author:

kohlhaas

Message:

closes #56

Location:

trunk/src/org/rapla

Files:

• facade/QueryModule.java (modified) (1 diff)
• facade/internal/FacadeImpl.java (modified) (2 diffs)
• gui/internal/action/AppointmentAction.java (modified) (2 diffs)
• gui/internal/action/ReservationAction.java (modified) (3 diffs)
• gui/internal/common/CalendarModelImpl.java (modified) (4 diffs)
• plugin/abstractcalendar/RaplaBuilder.java (modified) (4 diffs)

trunk/src/org/rapla/facade/QueryModule.java

@@ -118 +118 @@
      * The User cannot change appointments.*/
     boolean canExchangeAllocatables(Reservation reservation);
+    
+    boolean canReadReservationsFromOthers(User user);
 }
 

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;
     }
 

trunk/src/org/rapla/gui/internal/action/AppointmentAction.java

@@ -17 +17 @@
 import java.util.Date;
 
+import org.rapla.entities.User;
 import org.rapla.entities.domain.Allocatable;
 import org.rapla.entities.domain.Appointment;
@@ -156 +157 @@
         putValue(NAME, getString("view"));
         putValue(SMALL_ICON, getIcon("icon.help"));
+        User owner = appointment.getReservation().getOwner();
+        try 
+        {
+            User user = getUser();
+            boolean canView = getQuery().canReadReservationsFromOthers( user) || user.equals( owner);
+            setEnabled( canView);
+        } 
+        catch (RaplaException ex)
+        {
+            getLogger().error( "Can't get user",ex);
+        }
         return this;
     }

trunk/src/org/rapla/gui/internal/action/ReservationAction.java

@@ -16 +16 @@
 import java.awt.Point;
 
+import org.rapla.entities.User;
 import org.rapla.entities.domain.Reservation;
 import org.rapla.entities.dynamictype.DynamicType;
@@ -82 +83 @@
             setEnabled( m_wizard != null);
         }
+
     }
 
@@ -87 +89 @@
         m_wizard.start(parent, (CalendarModel)getService( CalendarModel.ROLE), guessType());
     }
+    
+
 }

trunk/src/org/rapla/gui/internal/common/CalendarModelImpl.java

@@ -29 +29 @@
 import org.rapla.components.util.DateTools;
 import org.rapla.components.xmlbundle.I18nBundle;
+import org.rapla.entities.Category;
 import org.rapla.entities.Named;
 import org.rapla.entities.RaplaObject;
@@ -37 +38 @@
 import org.rapla.entities.domain.Appointment;
 import org.rapla.entities.domain.AppointmentBlockArray;
+import org.rapla.entities.domain.Permission;
 import org.rapla.entities.domain.Reservation;
 import org.rapla.entities.dynamictype.Classifiable;
@@ -517 +519 @@
 
     public User[] getSelectedUsers()  {
+        User currentUser = getUser();
+        if ( currentUser != null && !m_facade.canReadReservationsFromOthers( currentUser))
+        {
+            return new User[] {currentUser};
+        }
         return (User[]) getSelected(User.TYPE).toArray(User.USER_ARRAY);
    }
@@ -612 +619 @@
         User[] users = getSelectedUsers();
         User currentUser = getUser();
+
+    
+            
         return ( users.length == 1 && users[0].equals( currentUser));
     }

trunk/src/org/rapla/plugin/abstractcalendar/RaplaBuilder.java

@@ -49 +49 @@
 import org.rapla.entities.domain.Appointment;
 import org.rapla.entities.domain.AppointmentBlockArray;
-import org.rapla.entities.domain.Permission;
 import org.rapla.entities.domain.Reservation;
 import org.rapla.entities.dynamictype.Attribute;
@@ -484 +483 @@
         User user;
         List blocks;
-        Category canReadOthersGroup;
+        boolean canReadOthers;
         
         public BuildContext(RaplaBuilder builder, List blocks)
@@ -499 +498 @@
             this.logger = builder.getLogger();
             this.user = builder.editingUser;
-            try {
-                this.canReadOthersGroup = builder.getClientFacade().getUserGroupsCategory().getCategory( Permission.GROUP_CAN_READ_EVENTS_FROM_OTHERS);
-            } catch (RaplaException ex)
-            {
-                // we assume that there is no other group
-            }
+            this.canReadOthers = builder.getClientFacade().canReadReservationsFromOthers(user);
         }
 
@@ -643 +637 @@
                return false;
            }
-           if ( buildContext.canReadOthersGroup == null ||  user.belongsTo( buildContext.canReadOthersGroup))
+           if ( buildContext.canReadOthers )
            {
                return false;