Skip to content

ZMI: Cover ZMSSqlDb-case 'connection closed #375

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

Open
drfho wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ZMI: Cover ZMSSqlDb-case 'connection closed #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a9cd51
ZMI: consider ZMSSqlDb-case 'connection closed
drfho Feb 24, 2025
4df252e
Merge branch 'main' into zmi_zsqldb_connection_closed
drfho Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSSqlDb/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ZMSSqlDb:
package = "com.zms.foundation"

# Revision
revision = "5.0.0"
revision = "5.1.0"

# Type
type = "ZMSObject"
Expand Down
19 changes: 15 additions & 4 deletions Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSSqlDb/renderShort.zpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
<!-- ZMSSqlDb.renderShort -->

<tal:block tal:define="zmscontext options/zmscontext">
<tal:block tal:define="
zmscontext options/zmscontext;
entities python:zmscontext.getEntities()">
<p class="my-2" style="color:#008ac7;">
<i class="fas fa-database"></i>
<strong tal:content="python:zmscontext.connection_id">the connection-id</strong>
</p>
<ul class="fa-ul">
<li tal:repeat="table python:[x for x in zmscontext.getEntities() if x['type']=='table']">
<ul class="fa-ul mb-5" tal:condition="entities">
<li tal:repeat="table python:[x for x in entities if x['type']=='table']">
<a class="font-monospace" tal:attributes="href python:'%s/manage_main?qentity=%s'%(zmscontext.id,table['id'])" >
<span class="fa-li"><i class="fas fa-table"></i></span>
<span class="table_id" tal:content="table/id">the table</span>
</a>
</li>
</ul>
<br/>
<div class="alert alert-warning ml-0" tal:condition="not:entities">
No tables found in this database.
<a href="#" target="_blank"
tal:attributes="
href python:'%s/%s/manage_main'%(zmscontext.getHome().absolute_url(),zmscontext.connection_id);
title python:'%s/%s/manage_main'%(zmscontext.getHome().absolute_url(),zmscontext.connection_id);">
Database connection
</a>
may be closed.
</div>
</tal:block>

<!-- /ZMSSqlDb.renderShort -->
3 changes: 2 additions & 1 deletion Products/zms/zmssqldb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,8 @@ def getEntities(self):

entities = []
da = self.getDA()
if da is None: return entities
if da is None or da.connected() is None:
return entities

tableBrwsrs = da.tpValues()

Expand Down