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

Issue #23042 Fixed jdbc pools js error #23675

Merged
merged 2 commits into from
Oct 26, 2021
Merged

Issue #23042 Fixed jdbc pools js error #23675

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
aedff8c
Issue #23042 Fixed jdbc pools js error
dmatej Oct 23, 2021
4624ecc
Issue #23042 Removed alert which caused that the error wasn't logged
dmatej Oct 23, 2021
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
20 changes: 8 additions & 12 deletions appserver/admingui/common/src/main/resources/js/adminjsf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2093,19 +2093,15 @@ admingui.table = {
},

changeButtons : function (buttons,tableId){
try {
var table = document.getElementById(tableId);// + ":_table");
var selections = table.getAllSelectedRowsCount();
var disabled = (selections > 0) ? false : true;
for (count=0; count < buttons.length; count++) {
var element = document.getElementById(buttons[count]);
if (element) {
element.disabled = disabled;
element.className = disabled ? "Btn2Dis_sun4" : "Btn1_sun4";
}
var table = document.getElementById(tableId);// + ":_table");
var selections = table.getAllSelectedRowsCount();
var disabled = (selections > 0) ? false : true;
for (count=0; count < buttons.length; count++) {
var element = document.getElementById(buttons[count]);
if (element) {
element.disabled = disabled;
element.className = disabled ? "Btn2Dis_sun4" : "Btn1_sun4";
}
} catch (err) {
alert(err);
}
},

Expand Down
9 changes: 4 additions & 5 deletions appserver/admingui/jca/src/main/resources/connectorConnectionPools.jsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<!composition template="/templates/default.layout"
guiTitle="$resource{i18njca.connectorConnectionPools.pageTitle}"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:Connectors');
admingui.nav.refreshTree('treeForm:tree:resources:jmsResources:jmsConnectionFactories');
setTimeout('admingui.table.changeOneTableButton(\\\\\'#{pageSession.topActionGroup}\\\\\', \\\\\'#{pageSession.tableId}\\\\\');', 0);"
admingui.nav.refreshTree('treeForm:tree:resources:jmsResources:jmsConnectionFactories');"
>
<!define name="content">
<event>
Expand All @@ -48,19 +47,19 @@
setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/resources");
setPageSessionAttribute(key="rest-api" value="true");
gf.getChildList(parentEndpoint="#{pageSession.parentUrl}", childType="#{pageSession.childType}", result="#{requestScope.listOfRows}");

/>
</event>
" <script type="text/javascript">admingui.nav.selectTreeNodeById(admingui.nav.TREE_ID+":resources:Connectors:connectorConnectionPools");</script>
<sun:form id="propertyForm">
#include "/common/shared/alertMsg_1.inc"
<sun:title id="propertyContentPage" title="$resource{i18njca.connectorConnectionPools.pageTitle}"
helpText="$resource{i18njca.connectorConnectionPools.pageTitleHelp}" />
"<br /> <br />
"<br /> <br />

#include "/jca/poolTable.inc"

<sun:hidden id="helpKey" value="$resource{help_jca.connectorConnectionPools}" />
<sun:hidden id="helpKey" value="$resource{help_jca.connectorConnectionPools}" />
</sun:form>
</define>
</composition>
7 changes: 3 additions & 4 deletions appserver/admingui/jca/src/main/resources/connectorSecurityMaps.jsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
setResourceBundle(key="i18njca" bundle="org.glassfish.jca.admingui.Strings");
setResourceBundle(key="help_jca" bundle="org.glassfish.jca.admingui.Helplinks")
/>
<!composition template="/templates/default.layout" guiTitle="$resource{i18njca.connectorSecurityMaps.pageTitle}"
guiTemplateOnLoad="setTimeout('admingui.table.changeOneTableButton(\\\\\'#{pageSession.topActionGroup}\\\\\', \\\\\'#{pageSession.tableId}\\\\\'); admingui.table.initAllRows(\\\\\'#{pageSession.tableId}\\\\\');', 0);">
<!composition template="/templates/default.layout" guiTitle="$resource{i18njca.connectorSecurityMaps.pageTitle}">
<!define name="content">
<event>
<!beforeCreate
Expand Down Expand Up @@ -68,11 +67,11 @@
#include "/common/shared/alertMsg_1.inc"
<sun:title id="propertyContentPage" title="$resource{i18njca.connectorSecurityMaps.pageTitle}"
helpText="$resource{i18njca.connectorSecurityMaps.pageTitleHelp}" />
"<br /> <br />
"<br /> <br />
#include "/common/resourceNode/poolNameSection.inc"
#include "/jca/securityMapsTable.inc"

<sun:hidden id="helpKey" value="$resource{help_jca.connectorSecurityMaps}" />
<sun:hidden id="helpKey" value="$resource{help_jca.connectorSecurityMaps}" />
</sun:form>
</define>
</composition>
7 changes: 3 additions & 4 deletions appserver/admingui/jca/src/main/resources/resourceAdapterConfigs.jsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
/>
<!composition template="/templates/default.layout"
guiTitle="$resource{i18njca.resourceAdapterConfig.pageTitle}"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:resourceAdapterConfigs');
setTimeout('admingui.table.changeOneTableButton(\\\\\'#{pageSession.topActionGroup}\\\\\', \\\\\'#{pageSession.tableId}\\\\\');', 0);"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:resourceAdapterConfigs');"
>
<!define name="content">
<event>
Expand All @@ -51,7 +50,7 @@
#include "/common/shared/alertMsg_1.inc"
<sun:title id="propertyContentPage" title="$resource{i18njca.resourceAdapterConfig.pageTitle}"
helpText="$resource{i18njca.resourceAdapterConfig.pageTitleHelp}" />
"<br /> <br />
"<br /> <br />

<sun:table id="poolTable" title="#{tableTitle}"
deselectMultipleButton="$boolean{true}"
Expand Down Expand Up @@ -85,7 +84,7 @@

</sun:table>

<sun:hidden id="helpKey" value="$resource{help_jca.resourceAdapterConfigs}" />
<sun:hidden id="helpKey" value="$resource{help_jca.resourceAdapterConfigs}" />
</sun:form>
</define>
</composition>
7 changes: 3 additions & 4 deletions appserver/admingui/jca/src/main/resources/workSecurityMaps.jsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
/>
<!composition template="/templates/default.layout"
guiTitle="$resource{i18njca.workSecurityMaps.pageTitle}"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:Connectors:workSecurityMaps');
setTimeout('admingui.table.changeOneTableButton(\\\\\'#{pageSession.topActionGroup}\\\\\', \\\\\'#{pageSession.tableId}\\\\\'); admingui.table.initAllRows(\\\\\'#{pageSession.tableId}\\\\\');', 0);"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:Connectors:workSecurityMaps');"
>
<!define name="content">
<event>
Expand All @@ -49,10 +48,10 @@
#include "/common/shared/alertMsg_1.inc"
<sun:title id="propertyContentPage" title="$resource{i18njca.workSecurityMaps.pageTitle}"
helpText="$resource{i18njca.workSecurityMaps.pageTitleHelp}" />
"<br /> <br />
"<br /> <br />

#include "/jca/securityMapsTable.inc"
<sun:hidden id="helpKey" value="$resource{help_jca.workSecurityMaps}" />
<sun:hidden id="helpKey" value="$resource{help_jca.workSecurityMaps}" />
</sun:form>
</define>
</composition>
13 changes: 6 additions & 7 deletions appserver/admingui/jdbc/src/main/resources/jdbcConnectionPools.jsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
<!-- jdbc/jdbcConnectionPools.jsf -->

<!initPage
setResourceBundle(key="i18njdbc" bundle="org.glassfish.jdbc.admingui.Strings");
setResourceBundle(key="i18njdbc" bundle="org.glassfish.jdbc.admingui.Strings");
setResourceBundle(key="help_jdbc" bundle="org.glassfish.jdbc.admingui.Helplinks");
/>
<!composition template="/templates/default.layout"
guiTitle="$resource{i18njdbc.jdbcConnectionPools.pageTitle}"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:JDBC');
setTimeout('admingui.table.changeOneTableButton(\\\\\'#{pageSession.topActionGroup}\\\\\', \\\\\'#{pageSession.tableId}\\\\\');', 0)"
guiTemplateOnLoad="admingui.nav.refreshTree('treeForm:tree:resources:JDBC');"
>
<!define name="content">
<event>
Expand All @@ -52,11 +51,11 @@
#include "/common/shared/alertMsg_1.inc"
<sun:title id="propertyContentPage" title="$resource{i18njdbc.jdbcConnectionPools.pageTitle}"
helpText="$resource{i18njdbc.jdbcConnectionPools.pageTitleHelp}"/>
"<br /><br />
"<br /><br />

#include "/jdbc/poolTable.inc"
<sun:hidden id="helpKey" value="$resource{help_jdbc.jdbcConnectionPools}" />
<sun:hidden id="helpKey" value="$resource{help_jdbc.jdbcConnectionPools}" />
</sun:form>
#include "/common/shared/changeButtonsJS.inc"
#include "/common/shared/changeButtonsJS.inc"
</define>
</composition>