Changeset 3536

Timestamp:

Jun 29, 2007, 9:09:08 AM (16 years ago)

Author:

Martin Svensson

Message:

References #625. This will correct the issue related to #657

Location:

trunk

Files:

• src/core/net/sf/basedb/util/ContextUtil.java (modified) (1 diff)
• www/common/plugin/index.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/ContextUtil.java

@@ -72 +72 @@
       if (!plugin.requiresConfiguration())
       {
-        ContextResult contextResult = new ContextResult(sc, plugin, null, context, currentItem);
-        if (contextResult.isInContext())
-        {
-          results.add(contextResult);
-        }
+          results.add(new ContextResult(sc, plugin, null, context, currentItem));
       }
       if (configQuery != null && plugin.supportsConfigurations())

trunk/www/common/plugin/index.jsp

@@ -180 +180 @@
     if (totalPlugins == 1 && contextMessages.size() == 0 && !(warnIfOpen && anotherIsOpen))
     {
-      // Only one plug-in exists, go directly to parameter input page
-      PluginDefinition thePlugin = contextResult.get(0).getPluginDefinition();
+      // Only one plug-in, that can be used, exists, find it in contextResult and 
+      //go directly to parameter input page
+      int i = 0;
+      PluginDefinition thePlugin = null;
+      while (i < contextResult.size() && thePlugin == null)
+      {
+        if (contextResult.get(i).isInContext())
+        {
+          thePlugin = contextResult.get(i).getPluginDefinition();
+        }
+        i++;
+      }
       PluginConfiguration theConfig = contextResult.get(0).getPluginConfiguration();
       int pluginDefinitionId = thePlugin.getId();