Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alternative JSON configuration system for OMERO.web #6086

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

Alternative JSON configuration system for OMERO.web #6086

wants to merge 9 commits into from

Commits on Jul 5, 2019

  1. Util for parsing a directory of json/yaml OMERO config files

    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    35697c3 View commit details
    Browse the repository at this point in the history

  2. OMERO.web settings load from $OMERO_WEB_CONFIG_DIR if set

    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    3f8a40b View commit details
    Browse the repository at this point in the history

  3. Track source of web config values 

    config.xml values are always strings so need to be mapped to the required types, JSON value are already type so only need to be mapped for limited values
    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    8e8d735 View commit details
    Browse the repository at this point in the history

  4. web json config: Handle set and append separately 

    This is necessary because the default values have to be loaded separately
    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    fda97e5 View commit details
    Browse the repository at this point in the history

  5. Util omero.settings.lookup_web_config to aid external lookups 

    New method that can be used to lookup OMERO.web django and config.xml settings
    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    800991b View commit details
    Browse the repository at this point in the history

  6. Fix web mapping types after rebase

    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    fafa7ef View commit details
    Browse the repository at this point in the history

  7. omeroweb.api needs to handle json conf

    @manics
    manics committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    f189f27 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2019

  1. omero.web json config: backwards compatibility with old mappings 

    Inspect the web settings mapping function and log a deprecation warning for old functions instead of failing.
    @manics
    manics committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    9442c7c View commit details
    Browse the repository at this point in the history

  2. web: Test new json and mapping methods

    @manics
    manics committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    1dabb0b View commit details
    Browse the repository at this point in the history