Skip to content

Commit d82df48

Browse files
authored
Merge pull request #1647 from iTerminate/master
Prepare patch for release
2 parents 4a5de57 + b60574e commit d82df48

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

etc/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.15.6
1+
3.15.7

src/java/CdbWebPortal/src/java/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ prettyPrint: true
44
cacheTTL: 0
55
openAPI:
66
info:
7-
version: '3.15.6'
7+
version: '3.15.7'
88
title: Component Database API
99
description: 'The API that provides access to Component Database data.'
1010
contact:

src/java/CdbWebPortal/web/views/itemDomainMachineDesignBase/private/templateDefaults/itemListObjectColumns/itemInstalledQrId.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ See LICENSE file.
2929
<ui:param name="installedQrIdPlannedText"
3030
value="#{mdTreeListObject != null and not mdTreeListObject.isHoused ? '(Planned)' : ''}" />
3131

32-
<p:commandLink id="#{entityTypeName}updateQrId" styleClass="fa fa-link-icon fa-qrcode"
33-
rendered="#{loginController.loggedIn}"
32+
<p:commandLink id="#{entityTypeName}updateQrId" styleClass="fa fa-link-icon fa-qrcode"
33+
rendered="#{representedElement == null and loginController.loggedIn}"
3434
action="#{entityController.preapreUpdateInstalledQrId(mdTreeListObject, 'PF(\'itemDomainMachineDesignUpdateInstalledQrIdDialogWidget\').show()')}"
3535
update="@form:itemDomainMachineDesignUpdateInstalledQrIdDialog">
3636
<p:tooltip for="#{entityTypeName}updateQrId" value="Update installed item qrid" />

tools/developer_tools/python-client/setup-api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from setuptools import find_packages
1717

1818
setup(name='ComponentDB-API',
19-
version='3.15.6',
19+
version='3.15.7',
2020
packages=["cdbApi",
2121
"cdbApi.api",
2222
"cdbApi.models"],

tools/developer_tools/python-client/setup-cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from setuptools import find_packages
1717

1818
setup(name='ComponentDB-CLI',
19-
version='3.15.6',
19+
version='3.15.7',
2020
packages=['cdbCli',
2121
'cdbCli.common',
2222
'cdbCli.common.cli',
@@ -32,7 +32,7 @@
3232
'pandas',
3333
'rich',
3434
'InquirerPy',
35-
'ComponentDB-API==3.15.6'],
35+
'ComponentDB-API==3.15.7'],
3636
license='Copyright (c) UChicago Argonne, LLC. All rights reserved.',
3737
description='Python APIs used to communicate with java hosted ComponentDB API.',
3838
maintainer='Dariusz Jarosz',

0 commit comments

Comments
 (0)