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

Merged in paulis/processmaker/HOR-1473 (pull request #4612)

Browse Source 
HOR-1473
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-29 11:39:18 -04:00
parent d1507fdacf 0dc6c96f6c
commit ff08fc0978
11 changed files with 65 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/js/dbConnections/main.js
View File

@@ -297,9 +297,9 @@ function testHost(step)
var user = $('form[DBS_USERNAME]').value;
if($('form[DBS_PASSWORD]').value != '') {
var passwd = $('form[DBS_PASSWORD]').value;
var pas = $('form[DBS_PASSWORD]').value;
} else {
var passwd = 'none';
var pas = 'none';
}
if($('form[DBS_PORT]').value.trim() != '') {
@@ -312,7 +312,7 @@ function testHost(step)
var tns = getField("DBS_TNS").value;
var requestfile = PROCESS_REQUEST_FILE;
var uri = 'action=testConnection&step='+step+'&type='+type+'&server='+server+'&db_name='+db_name+'&user='+user+'&port='+port+'&passwd='+passwd + "&connectionType=" + connectionType + "&tns=" + tns;
var uri = 'action=testConnection&step='+step+'&type='+type+'&server='+server+'&db_name='+db_name+'&user='+user+'&port='+port+'&passwd='+pas + "&connectionType=" + connectionType + "&tns=" + tns;
var ajax = AJAX();
mainRequest = ajax;

3
workflow/engine/methods/dbConnections/dbConnectionsAjax.php
View File

@@ -351,7 +351,8 @@ switch ($action) {
if ($engine != "0") {
$dbs = new dbConnections();
echo Bootstrap::json_encode($dbs->getEncondeList($filter->xssFilterHard($engine)));
$var = Bootstrap::json_encode($dbs->getEncondeList($filter->xssFilterHard($engine)));
echo $var;
} else {
echo '[["0","..."]]';

6
workflow/engine/methods/users/users_Ajax.php
View File

@@ -91,11 +91,13 @@ try {
$oTasks = new Tasks();
switch ((int) $_POST['TU_RELATION']) {
case 1:
echo htmlentities($oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
$resh = htmlentities($oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
echo $res;
G::auditlog("AssignUserTask","Assign a User to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
case 2:
echo htmlentities($oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
$resh = htmlentities($oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
echo $resh;
G::auditlog("AssignGroupTask","Assign a Group to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
}

50
workflow/engine/templates/reportTables/mainLoad.php
View File

@@ -1,50 +0,0 @@
<?php
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if(isset($_GET['gui'])) {
$_GET['gui'] = $filter->xssFilterHard($_GET['gui']);
$gui = $_GET['gui'];
}
?>
<html>
<style>
.Footer{
font :normal 8pt sans-serif,Tahoma,MiscFixed !important;
color :#000 !important;
height :0px !important;
text-align :center !important;
}
.Footer .content{
color :black !important;
padding :0px !important;
}
</style>
<body onresize="autoResizeScreen()" onload="autoResizeScreen()">
<iframe name="frameMain" id="frameMain" src ="../reportTables/mainInit?PRO_UID=<?php echo $filter->xssFilterHard($gui);?>" width="99%" height="200" frameborder="0">
<p>Your browser does not support iframes.</p>
</iframe>
</body>
<script>
oClientWinSize = getClientWindowSize();
h = getStyle(document.getElementById('pm_menu'),'top');
h = h.replace("px", "");
h = parseInt(h) + 18;
if ( document.getElementById('pm_submenu') )
document.getElementById('pm_submenu').style.display = 'none';
document.documentElement.style.overflowY = 'hidden';
function autoResizeScreen() {
oCasesFrame = document.getElementById('frameMain');
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height-105;
oCasesFrame.style.height = height;
//oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
//oCasesSubFrame.style.height = height-10;
}
function getStyle(targetElement,styleProp) {
if (targetElement) {
if (targetElement.currentStyle) return targetElement.currentStyle[styleProp];
else if (window.getComputedStyle) return document.defaultView.getComputedStyle(targetElement,null).getPropertyValue(styleProp);
}
}
</script>
</html>

8
workflow/engine/templates/setup/environmentSettings.js
View File

@@ -3,7 +3,7 @@ var fsSamples;
var fsNames;
var fsDates;
var fsCases;
var _firstName, _lastName, _userName, _dateSample;
var _firstName, _lastName, _uName, _dateSample;
var txtCasesRefreshTime;
@@ -12,7 +12,7 @@ Ext.onReady(function() {
_firstName = 'John';
_lastName = 'Deere';
_userName = 'johndeere';
_uName = 'johndeere';
_dateSample = '2011-02-17 19:15:38';
fsSample = new Ext.form.FieldSet({
@@ -321,7 +321,7 @@ Ext.onReady(function() {
//Load Samples Label
loadSamples = function ()
{
Ext.getCmp("lblFullName").setText(_FNF(_userName, _firstName, _lastName, FORMATS.format));
Ext.getCmp("lblFullName").setText(_FNF(_uName, _firstName, _lastName, FORMATS.format));
Ext.getCmp("lblDateFormat").setText(_DF(_dateSample, FORMATS.dateFormat));
Ext.getCmp("lblCasesDateFormat").setText(_DF(_dateSample, FORMATS.casesListDateFormat, FORMATS.casesListDateFormat));
//Ext.getCmp("lblCasesRowsList").setText(FORMATS.casesListRowNumber);
@@ -338,7 +338,7 @@ changeSettings = function (iType)
var f = FORMATS.format;
FORMATS.format = cmbUsernameFormat.getValue();
Ext.getCmp("lblFullName").setText(_FNF(_userName, _firstName, _lastName, cmbUsernameFormat.getValue()));
Ext.getCmp("lblFullName").setText(_FNF(_uName, _firstName, _lastName, cmbUsernameFormat.getValue()));
FORMATS.format = f;
break;
case 2: