fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 14056 "Oracle Connection Parameters with TNS" SOLVED

Browse Source 
- Oracle Connection Parameters with TNS.
- Problema resuelto, en DATABASE CONNECTIONS al hacer click en New, en el dynaform "Add new Database Source" se agrega
  dos campos un dropdown "Select type connection" con dos opciones "NORMAL y TNS" y el campo de tipo "TNS", estos nuevos
  campos se muestran cuando se selecciona la opcion en engine "oracle" si es en otro caso se ocultaran. Tambien se adiciona
  dos nuevos campos en la tabla "DB_SOURCE" que son: "DBS_CONNECTION_TYPE" y "DBS_TNS".
  Cuando se selecciona "oracle" y tipo de conexion "TNS", al llenar los datos al dynaform y hacer click en el boton
  "test connection" realizara la prueba con exito o falla.
  Cuando se selecciona "oracle" y tipo de conexion "NORMAL", al llenar los datos al dynaform y hacer click en el boton
  "test connection" realizara la conexion tal como se hacia anteriomente.
This commit is contained in:
Luis Fernando Saisa Lopez
2014-05-16 18:05:34 -04:00
parent 35c96169f3
commit 59d2912863
16 changed files with 665 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
workflow/engine/xmlform/dbConnections/dbConnections_Edit.html
View File

@@ -1,4 +1,4 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
@@ -15,47 +15,58 @@
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_UID}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_UID} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_UID}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_UID}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_TYPE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_TYPE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TYPE}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TYPE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_ENCODE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_ENCODE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_ENCODE}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_ENCODE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_CONNECTION_TYPE} </td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_CONNECTION_TYPE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_TNS}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TNS}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_SERVER}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_SERVER} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_SERVER}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_SERVER}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_DATABASE_NAME}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_DATABASE_NAME} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DATABASE_NAME}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DATABASE_NAME}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_USERNAME}</td>
<td class="FormLabel" width="{$form_labelWidth}"><span id="userName"><font color="red">* </font></span>{$DBS_USERNAME}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_USERNAME} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_USERNAME}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_USERNAME}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_PASSWORD}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_PASSWORD} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PASSWORD}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PASSWORD}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_PORT}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_PORT} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PORT}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PORT}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_DESCRIPTION}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_DESCRIPTION} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DESCRIPTION}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DESCRIPTION}</td>
</tr>
<tr>
<td class="FormButton" colspan="2" align="center"></td>
@@ -73,5 +84,5 @@
<script type="text/javascript">
{$form.JS}
</script>
</form>
</form>

31
workflow/engine/xmlform/dbConnections/dbConnections_Edit.xml
View File

@@ -7,13 +7,24 @@
</DBS_UID>
<DBS_TYPE type="dropdown" sqlconnection="dbarray">
SELECT * FROM BDCONNECTIONS
SELECT * FROM BDCONNECTIONS
<en>Engine<option name="">...</option></en>
</DBS_TYPE>
<DBS_ENCODE type="dropdown">
<DBS_ENCODE type="dropdown">
<en>Encode<option name="">...</option></en>
</DBS_ENCODE>
</DBS_ENCODE>
<DBS_CONNECTION_TYPE type="dropdown" defaultvalue="NORMAL" required="0" readonly="0" optgroup="0" mode="edit">
<en>Select type connection
<option name="NORMAL">Normal</option>
<option name="TNS">TNS</option>
</en>
</DBS_CONNECTION_TYPE>
<DBS_TNS type="text" size="25" maxlength="100" defaultvalue="" required="true">
<en>TNS</en>
</DBS_TNS>
<DBS_SERVER type="text" size="25" maxlength="100" defaultvalue="" required="true">
<en>Server</en>
@@ -53,17 +64,21 @@
<JS type="javascript"><![CDATA[
hideRowById('DBS_ENCODE');
leimnud.event.add(getField('DBS_TYPE'), 'change', function() {
showEncodes('@#DBS_ENCODE');
onChangeType();
}.extend(getField('DBS_TYPE')));
showEncodes('@#DBS_ENCODE');
function cancel(){
oPanel.remove();
}
}
leimnud.event.add(getField("DBS_CONNECTION_TYPE"), "change", function() {
showEncodes();
});
]]></JS>
</dynaForm>
</dynaForm>

33
workflow/engine/xmlform/dbConnections/dbConnections_New.html
View File

@@ -1,4 +1,4 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit='return validateForm("{$form_objectRequiredFields}".parseJSON());'>
<div class="borderForm" style="padding-left: 0pt; padding-right: 0pt;">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
@@ -18,42 +18,53 @@
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_TYPE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_TYPE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TYPE}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TYPE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_ENCODE}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_ENCODE} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_ENCODE}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_ENCODE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_CONNECTION_TYPE} </td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_CONNECTION_TYPE}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_TNS}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_TNS}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_SERVER}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_SERVER} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_SERVER}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_SERVER}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_DATABASE_NAME}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_DATABASE_NAME} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DATABASE_NAME}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DATABASE_NAME}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_USERNAME}</td>
<td class="FormLabel" width="{$form_labelWidth}"><span id="userName"><font color="red">* </font></span>{$DBS_USERNAME}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_USERNAME} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_USERNAME}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_USERNAME}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_PASSWORD}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_PASSWORD} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PASSWORD}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PASSWORD}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font>{$DBS_PORT}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_PORT} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PORT}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_PORT}</td>
</tr>
<tr>
<td class="FormLabel" width="{$form_labelWidth}">{$DBS_DESCRIPTION}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.DBS_DESCRIPTION} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DESCRIPTION}</td>
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.DBS_DESCRIPTION}</td>
</tr>
<tr>
<td class="FormButton" colspan="2" align="center"></td>
@@ -71,5 +82,5 @@
<script type="text/javascript">
{$form.JS}
</script>
</form>

26
workflow/engine/xmlform/dbConnections/dbConnections_New.xml
View File

@@ -6,14 +6,25 @@
<PRO_UID type="hidden"/>
<DBS_TYPE type="dropdown" sqlconnection="dbarray" required="true">
SELECT * FROM BDCONNECTIONS
SELECT * FROM BDCONNECTIONS
<en>Engine<option name="">Select...</option></en>
</DBS_TYPE>
<DBS_ENCODE type="dropdown" required="true">
<DBS_ENCODE type="dropdown" required="true">
<en>Encode<option name="">...</option></en>
</DBS_ENCODE>
<DBS_CONNECTION_TYPE type="dropdown" defaultvalue="NORMAL" required="0" readonly="0" optgroup="0" mode="edit">
<en>Select type connection
<option name="NORMAL">Normal</option>
<option name="TNS">TNS</option>
</en>
</DBS_CONNECTION_TYPE>
<DBS_TNS type="text" size="25" maxlength="100" defaultvalue="" required="true">
<en>TNS</en>
</DBS_TNS>
<DBS_SERVER type="text" size="25" maxlength="100" defaultvalue="" required="true">
<en>Server</en>
</DBS_SERVER>
@@ -57,10 +68,17 @@
showEncodes();
onChangeType();
}.extend(getField('DBS_TYPE')));
function cancel(){
oPanel.remove();
}
}
hideRowById("DBS_CONNECTION_TYPE");
hideRowById("DBS_TNS");
leimnud.event.add(getField("DBS_CONNECTION_TYPE"), "change", function() {
showEncodes();
});
]]></JS>
</dynaForm>