Commit 6c0d37ba authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch '142-fix-tool-section-descriptions' into 'dev' 

Fix section descriptions in tool_conf.xml

Closes #142

See merge request !129
parents 5f376139 2d452e62

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ variables: 
  CONTAINER_GALAXY_URL: "${NDIP_DOCKER_REPOSITORY}/${CI_PROJECT_PATH}"

  CONTAINER_GALAXY_BASE_URL: "${CONTAINER_GALAXY_URL}/base"

  CONTAINER_GALAXY_COMMIT_URL: "${CONTAINER_GALAXY_URL}/commit"

  GALAXY_VERSION_PYTHON: 24.2.dev6+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev6.ornl

  GALAXY_VERSION_PYTHON: 24.2.dev7+ornl

  GALAXY_VERSION_DOCKER: 24.2.dev7.ornl



# This import is for the func_rse_docker_* functions

before_script:

lib/galaxy/tool_util/toolbox/base.py

+1 −0
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ class AbstractToolBox(ManagesIntegratedToolPanelMixin): 
                section_dict = {

                    "id": val.id or "",

                    "name": val.name or "",

                    "description": val.description or "",

                    "version": val.version or "",

                }

                section = ToolSection(section_dict)

lib/galaxy/tool_util/toolbox/integrated_panel.py

+2 −1
Original line number Diff line number Diff line
@@ -96,9 +96,10 @@ $INTEGRATED_TOOL_PANEL 
                elif item_type == panel_item_types.SECTION:

                    section_id = item.id or ""

                    section_name = item.name or ""

                    section_description = item.description or ""

                    section_version = item.version or ""

                    integrated_tool_panel.append(

                        f'    <section id="{escape(section_id)}" name="{escape(section_name)}" version="{section_version}">\n'

                        f'    <section id="{escape(section_id)}" name="{escape(section_name)}" description="{section_description}" version="{section_version}">\n'

                    )

                    for _section_key, section_item_type, section_item in item.panel_items_iter():

                        if section_item_type == panel_item_types.TOOL: