Changeset 3074

Timestamp:

Jan 22, 2007, 11:16:43 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #476: "Import" button is not shown even if the user has permission to use an
import plugin in a given context

Location:

trunk/src/core

Files:

• common-queries.xml (modified) (1 diff)
• net/sf/basedb/core/PluginDefinition.java (modified) (3 diffs)

trunk/src/core/common-queries.xml

@@ -1786 +1786 @@
       JOIN plg.guiContexts gcx
       LEFT JOIN plg.configurations cfg
-        WITH cfg.owner.id = :owner OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
+      WITH true = :hasConfigPermission OR cfg.owner.id = :owner 
+        OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
       WHERE 
-      (plg.owner.id = :owner OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
+        (true = :hasPluginPermission OR plg.owner.id = :owner 
+        OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
       AND gcx.itemType = :itemType AND gcx.contextType = :contextType
       AND (

trunk/src/core/net/sf/basedb/core/PluginDefinition.java

@@ -266 +266 @@
     throws BaseException
   {
+    SessionControl sc = dc.getSessionControl();
+    boolean hasConfigPermission = sc.hasPermission(Permission.USE, Item.PLUGINCONFIGURATION);
+    boolean hasPluginPermission = sc.hasPermission(Permission.USE, Item.PLUGINDEFINITION);
+    
     org.hibernate.Session session = dc.getHibernateSession();
     org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "COUNT_PLUGINS_BY_TYPE_FOR_CONTEXT");
@@ -273 +277 @@
       JOIN plg.guiContexts gcx
       LEFT JOIN plg.configurations cfg
-        WITH cfg.owner.id = :owner OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
+      WITH true = :hasConfigPermission OR cfg.owner.id = :owner 
+        OR cfg.itemKey.id IN (:itemKeys) OR cfg.projectKey.id IN (:projectKeys)
       WHERE 
-      (plg.owner.id = :owner OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
+        (true = :hasPluginPermission OR plg.owner.id = :owner 
+        OR plg.itemKey.id IN (:itemKeys) OR plg.projectKey.id IN (:projectKeys))
       AND gcx.itemType = :itemType AND gcx.contextType = :contextType
       AND (
@@ -284 +290 @@
       GROUP BY plg.mainType
     */
+    
+    // Context
     query.setInteger("itemType", gc.getItem().getValue());
     query.setInteger("contextType", gc.getType().getValue());
 
-    SessionControl sc = dc.getSessionControl();
+    // Role permissions
+    query.setBoolean("hasConfigPermission", hasConfigPermission);
+    query.setBoolean("hasPluginPermission", hasPluginPermission);
+    
     // Owner
     query.setInteger("owner", sc.getLoggedInUserId());