Changeset 8099


Ignore:
Timestamp:
Dec 20, 2022, 2:16:51 PM (9 months ago)
Author:
Nicklas Nordborg
Message:

References #2290: Allow plug-in configurations to be disabled

Added a filter to get rid of disabled plug-in configurations when starting a new job.

Location:
branches/3.19-stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/3.19-stable/src/core/common-queries.xml

    r8053 r8099  
    18561856      )
    18571857      AND plg.disabled = false
     1858      AND (cfg.id IS NULL OR cfg.disabled = false)
    18581859      GROUP BY plg.mainType
    18591860    </sql>
  • branches/3.19-stable/src/core/net/sf/basedb/core/PluginDefinition.java

    r7513 r8099  
    303303      )
    304304      AND plg.disabled = false
     305      AND (cfg.id IS NULL OR cfg.disabled = false)
    305306      GROUP BY plg.mainType
    306307    */
  • branches/3.19-stable/src/core/net/sf/basedb/util/AutoDetectFileFormat.java

    r6127 r8099  
    130130        ItemQuery<PluginConfiguration> configQuery = plugin.getPluginConfigurations();
    131131        configQuery.restrict(Restrictions.gt(Hql.property("parameterVersion"), Expressions.integer(0)));
     132        configQuery.restrict(Restrictions.eq(Hql.property("disabled"), Expressions.parameter("isDisabled", false)));
    132133        configQuery.order(Orders.asc(Hql.property("name")));
    133134        configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
  • branches/3.19-stable/www/common/import/index.jsp

    r7954 r8099  
    107107        )
    108108      );
     109    configQuery.restrict(Restrictions.eq(Hql.property("disabled"), Expressions.parameter("isDisabled", false)));
    109110    configQuery.order(Orders.asc(Hql.property("name")));
    110111    configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
  • branches/3.19-stable/www/common/plugin/index.jsp

    r7954 r8099  
    180180      );
    181181    configQuery.restrict(Restrictions.gt(Hql.property("parameterVersion"), Expressions.integer(0)));
     182    configQuery.restrict(Restrictions.eq(Hql.property("disabled"), Expressions.parameter("isDisabled", false)));
    182183    configQuery.order(Orders.asc(Hql.property("name")));
    183184    configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
Note: See TracChangeset for help on using the changeset viewer.