Changeset 5926

Timestamp:

Jan 16, 2012, 9:15:15 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1572: Filtering of rawbioassays when adding to experiment does not work properly

The problem was that when the user is not a real member of a project, but administrative permissions makes it possible to set it as the active project, the administrative permissions are 'forgotten' in some cases (eg. when using the permission filter on an item query). This has now been fixed by making sure that the role-based permissions for the project are considered when determining the final permissions.

File:

• branches/3.0-stable/src/core/net/sf/basedb/core/Keyring.java (modified) (4 diffs)

branches/3.0-stable/src/core/net/sf/basedb/core/Keyring.java

@@ -164 +164 @@
     TRUE if the Timer has signaled that it is time to reload the information.
   */
-  private boolean reload;
+  private volatile boolean reload;
 
   /**
@@ -263 +263 @@
   {
     if (!getReload()) return true;
+    setReload(false);
     org.hibernate.Session session = null;
     org.hibernate.Transaction tx = null;
@@ -284 +285 @@
         loadPluginPermissionKeys(session);
       }
-      setReload(false);
       // Schedule another reload as configured in base.config
       Application.getCoreTimer().schedule(new ReloadTask(), 
@@ -743 +743 @@
     else
     {
-      maxProjectPermission = IntegerUtil.getInt(projects.get(projectId));
+      maxProjectPermission = IntegerUtil.getInt(projects.get(projectId)) | getRolePermissions(Item.PROJECT);
     }
   }