Changeset 5588

Timestamp:

Mar 15, 2011, 2:53:10 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1588: Plug-in configurations that hasn't been configued should not be visible in the gui

Location:

branches/2.17-stable

Files:

• src/core/common-queries.xml (modified) (1 diff)
• src/core/net/sf/basedb/util/AutoDetectFileFormat.java (modified) (2 diffs)
• www/common/plugin/index.jsp (modified) (1 diff)

branches/2.17-stable/src/core/common-queries.xml

@@ -1977 +1977 @@
         (plg.requiresConfiguration = false)
         OR
-        (plg.requiresConfiguration = true AND NOT cfg.id IS NULL)
+        (plg.requiresConfiguration = true AND cfg.parameterVersion > 0)
       )
       GROUP BY plg.mainType

branches/2.17-stable/src/core/net/sf/basedb/util/AutoDetectFileFormat.java

@@ -35 +35 @@
 import net.sf.basedb.core.PluginConfiguration;
 import net.sf.basedb.core.PluginDefinition;
+import net.sf.basedb.core.query.Expressions;
 import net.sf.basedb.core.query.Orders;
 import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.core.plugin.AutoDetectingImporter;
 import net.sf.basedb.core.plugin.GuiContext;
@@ -138 +140 @@
       {
         ItemQuery<PluginConfiguration> configQuery = plugin.getPluginConfigurations();
+        configQuery.restrict(Restrictions.gt(Hql.property("parameterVersion"), Expressions.integer(0)));
         configQuery.order(Orders.asc(Hql.property("name")));
         configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);

branches/2.17-stable/www/common/plugin/index.jsp

@@ -177 +177 @@
         )
       );
+    configQuery.restrict(Restrictions.gt(Hql.property("parameterVersion"), Expressions.integer(0)));
     configQuery.order(Orders.asc(Hql.property("name")));
     configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);